From e821db0400f505a5bbff7e3f1b2c8c8189c86eab Mon Sep 17 00:00:00 2001 From: Ryan Buckley Date: Tue, 15 Dec 2015 22:26:23 -0800 Subject: [PATCH] can use default rake command to run test suite --- .travis.yml | 2 -- README.md | 1 - Rakefile | 16 ++++++++++++++-- bin/test | 3 --- 4 files changed, 14 insertions(+), 8 deletions(-) delete mode 100755 bin/test diff --git a/.travis.yml b/.travis.yml index ea20ba9..33f5f01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,5 +5,3 @@ rvm: - 2.2.2 - 2.2.3 before_install: gem install bundler -v 1.10.5 -script: - - bin/test diff --git a/README.md b/README.md index d22a8d2..4aa32af 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,6 @@ and would love to see these two consolidated at some point. ## Contributing 1. Fork it ( https://github.com/ridiculous/grape-middleware-logger/fork ) -1. Run the test suite with `bin/test` 2. Create your feature branch (`git checkout -b my-new-feature`) 3. Commit your changes (`git commit -am 'Add some feature'`) 4. Push to the branch (`git push origin my-new-feature`) diff --git a/Rakefile b/Rakefile index eb04e1a..129f6a7 100644 --- a/Rakefile +++ b/Rakefile @@ -1,3 +1,15 @@ require 'rspec/core/rake_task' -RSpec::Core::RakeTask.new(:spec) -task default: :spec + +RSpec::Core::RakeTask.new(:spec) do |config| + config.pattern = 'spec/lib/**/*_spec.rb' +end + +RSpec::Core::RakeTask.new(:integration) do |config| + config.pattern = 'spec/integration/**/*_spec.rb' +end + +RSpec::Core::RakeTask.new(:integration_rails) do |config| + config.pattern = 'spec/integration_rails/**/*_spec.rb' +end + +task default: [:spec, :integration, :integration_rails] diff --git a/bin/test b/bin/test deleted file mode 100755 index 94a76cf..0000000 --- a/bin/test +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -set -ev -bundle exec rspec spec/lib && bundle exec rspec spec/integration && bundle exec rspec spec/integration_rails