Moved spec/acceptance back to ./acceptance, and renamed rake task to …

…simply `rake acceptance`

.travis.yml

@@ -41,7 +41,7 @@ before_script:
   - "sh -e /etc/init.d/xvfb start"
 
 # Run RSpec tests and ensure that assets can compile without errors
-script: "bundle exec rake spec:no_acceptance && bundle exec rake spec:acceptance && bundle exec rake assets:precompile RAILS_ENV=production"
+script: "bundle exec rake spec && bundle exec rake acceptance && bundle exec rake assets:precompile RAILS_ENV=production"
 
 # To stop Travis from running tests for a new commit,
 # add the following to your commit message: [ci skip]

Gemfile

@@ -43,10 +43,10 @@ group :development, :test do
     gem 'awesome_print'
   end
 
-  gem 'test-unit',          '~> 2.4.3',  :platform => :mri_19, :require => false
+  gem 'test-unit',          '~> 2.4.3', :platform => :mri_19, :require => false
   gem 'rspec-rails',        '~> 2.8.0'
   gem 'factory_girl'
-  gem 'steak',              '~> 2.0.0'
+  gem 'steak',              '~> 2.0.0', :require => false
   gem 'headless',           '~> 0.2.2'
 end
 

spec/acceptance/acceptance_helper.rb → acceptance/acceptance_helper.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../../spec_helper.rb", __FILE__)
+require File.expand_path("../../spec/spec_helper.rb", __FILE__)
 
 require 'steak'
 require 'capybara/rails'

lib/tasks/rspec.rake

@@ -9,14 +9,13 @@ if defined?(RSpec)
       Rake::Task["db:schema:load"].invoke
       Rails.env = tmp_env
     end
-
-    desc "Run all specs except acceptance"
-    RSpec::Core::RakeTask.new(:no_acceptance => "spec:prepare") do |c|
-      include_dirs = Dir["./spec/*/"].map { |dir| File.basename(dir) } - ["acceptance"]
-      c.pattern = "./spec/{#{include_dirs.join(",")}}/**/*_spec.rb"
-    end  
   end
 
   Rake::Task["spec"].prerequisites.clear
   Rake::Task["spec"].prerequisites.push("spec:prepare")
+
+  desc 'Run the acceptance specs in ./acceptance'
+  RSpec::Core::RakeTask.new(:acceptance => 'db:test:prepare') do |t|
+    t.pattern = 'acceptance/**/*_spec.rb'
+  end  
 end