From fcb01718518a1629d8f7b5342c0153f51dc0fd0c Mon Sep 17 00:00:00 2001 From: Larry Karnowski and Lake Denman Date: Thu, 5 Apr 2012 10:58:41 -0400 Subject: [PATCH] GH #13: separate acceptance from unit tests --- spec/acceptance_spec.rb | 2 +- spec/spec_helper.rb | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/spec/acceptance_spec.rb b/spec/acceptance_spec.rb index a7906f1..0eedaed 100644 --- a/spec/acceptance_spec.rb +++ b/spec/acceptance_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe 'App is alive', :js => true do +describe 'App is alive', :js => true, :acceptance => true do it 'verifies coffeescript served up as js' do visit '/assets/relevance_rails.js' page.should have_content "console.log('Hello from Relevance, Inc!');" diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 88583e8..9820e9f 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -25,18 +25,24 @@ def should_abort_with(msg) end RSpec.configure do |config| - config.include Capybara::DSL - config.include TestHelpers - config.filter_run :focused => true - config.filter_run_excluding :disabled => true + if ENV['ACCEPTANCE'] + config.include Capybara::DSL + config.filter_run :acceptance => true + config.run_all_when_everything_filtered = false + else + config.include TestHelpers + config.filter_run :focused => true + config.filter_run_excluding :acceptance => true + config.filter_run_excluding :disabled => true + config.run_all_when_everything_filtered = true + end + config.alias_example_to :fit, :focused => true config.alias_example_to :xit, :disabled => true config.alias_example_to :they - config.run_all_when_everything_filtered = true end Capybara.current_driver = :selenium Capybara.run_server = false -# vagrant or ec2 instance is up and running ... -Capybara.app_host = 'http://localhost:3000' -# Capybara.app_host = 'http://184.72.185.16' +#Capybara.app_host = 'http://' + (ENV["ACCEPTANCE_HOST"] || 'localhost:3000') +Capybara.app_host = ENV["ACCEPTANCE_HOST"] || 'http://localhost:3000'