Moved acceptance tests under spec

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

@@ -1,6 +1,20 @@
-require File.expand_path("../../spec/spec_helper.rb", __FILE__)
+require File.expand_path("../spec_helper.rb", __FILE__)
 
-# Put your acceptance spec helpers inside spec/acceptance/support
+require 'steak'
+require 'capybara/rails'
+
+module Steak::Capybara
+  include Rack::Test::Methods
+  include Capybara
+
+  def app
+    ::Rails.application
+  end
+end
+
+RSpec.configuration.include Steak::Capybara, :type => :acceptance
+
+# Put your acceptance spec helpers inside /spec/acceptance/support
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 # Workaround for ActionDispatch::ClosedError

acceptance/accounts_feature_spec.rb → spec/acceptance/accounts_feature_spec.rb

@@ -19,12 +19,12 @@
     page.should have_content('Create Account')
   end
 
-  #scenario 'should create a new account', :js => true do
-    #visit accounts_path
-    #click_link "Create Account"
-    #fill_in 'account_name', :with => "My new account"
-    #click_button 'Create Account'
-    #page.should have_content('My new account')
-  #end
+  #~ scenario 'should create a new account', :js => true do
+    #~ visit accounts_path
+    #~ click_link "Create Account"
+    #~ fill_in 'account_name', :with => "My new account"
+    #~ click_button 'Create Account'
+    #~ page.should have_content('My new account')
+  #~ end
 
 end