From d4ea4bfb060d6874001b8fc6e67f27c05647d664 Mon Sep 17 00:00:00 2001 From: Thomas Walpole Date: Thu, 20 Oct 2016 09:53:42 -0700 Subject: [PATCH] minor test cleanup --- Rakefile | 3 +-- spec/selenium_spec_chrome.rb | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Rakefile b/Rakefile index 6083aee7..4a337abe 100644 --- a/Rakefile +++ b/Rakefile @@ -8,7 +8,7 @@ RSpec::Core::RakeTask.new(:spec) do |t| t.rspec_opts = %w[--color] t.rspec_opts << '--format documentation' if RUBY_PLATFORM=='java' # When we drop RSpec 2.x support we can rename spec_chrome.rb and implement this properly - # t.exclude_pattern = './spec/*{_chrome_spec.rb}' + # t.exclude_pattern = './spec/*{_chrome_spec.rb, _marionette_spec.rb}' t.pattern = './spec{,/*/**}/*{_spec.rb,_spec_firefox.rb}' end @@ -17,7 +17,6 @@ RSpec::Core::RakeTask.new(:spec_marionette) do |t| # jruby buffers the progress formatter so travis doesn't see output often enough t.rspec_opts << '--format documentation' if RUBY_PLATFORM=='java' t.pattern = './spec{,/*/**}/*{_spec.rb,_spec_marionette.rb}' - # t.pattern = './spec/*{_spec_legacy_firefox.rb}' end RSpec::Core::RakeTask.new(:spec_chrome) do |t| diff --git a/spec/selenium_spec_chrome.rb b/spec/selenium_spec_chrome.rb index 9f2f2abc..54ddc943 100644 --- a/spec/selenium_spec_chrome.rb +++ b/spec/selenium_spec_chrome.rb @@ -12,14 +12,10 @@ module TestSessions Chrome = Capybara::Session.new(:selenium_chrome, TestApp) end -skipped_tests = [] +skipped_tests = [:response_headers, :status_code, :trigger] skipped_tests << :windows if ENV['TRAVIS'] && !ENV['WINDOW_TEST'] -Capybara::SpecHelper.run_specs TestSessions::Chrome, "selenium_chrome", capybara_skip: [ - :response_headers, - :status_code, - :trigger - ] unless ENV['TRAVIS'] && (RUBY_PLATFORM == 'java') +Capybara::SpecHelper.run_specs TestSessions::Chrome, "selenium_chrome", capybara_skip: skipped_tests RSpec.describe "Capybara::Session with chrome" do include_examples "Capybara::Session", TestSessions::Chrome, :selenium_chrome