mirror of
https://github.com/teamcapybara/capybara.git
synced 2022-11-09 12:08:07 -05:00
minor test cleanup
This commit is contained in:
parent
590ea2bc46
commit
d4ea4bfb06
2 changed files with 3 additions and 8 deletions
3
Rakefile
3
Rakefile
|
@ -8,7 +8,7 @@ RSpec::Core::RakeTask.new(:spec) do |t|
|
||||||
t.rspec_opts = %w[--color]
|
t.rspec_opts = %w[--color]
|
||||||
t.rspec_opts << '--format documentation' if RUBY_PLATFORM=='java'
|
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
|
# 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}'
|
t.pattern = './spec{,/*/**}/*{_spec.rb,_spec_firefox.rb}'
|
||||||
end
|
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
|
# jruby buffers the progress formatter so travis doesn't see output often enough
|
||||||
t.rspec_opts << '--format documentation' if RUBY_PLATFORM=='java'
|
t.rspec_opts << '--format documentation' if RUBY_PLATFORM=='java'
|
||||||
t.pattern = './spec{,/*/**}/*{_spec.rb,_spec_marionette.rb}'
|
t.pattern = './spec{,/*/**}/*{_spec.rb,_spec_marionette.rb}'
|
||||||
# t.pattern = './spec/*{_spec_legacy_firefox.rb}'
|
|
||||||
end
|
end
|
||||||
|
|
||||||
RSpec::Core::RakeTask.new(:spec_chrome) do |t|
|
RSpec::Core::RakeTask.new(:spec_chrome) do |t|
|
||||||
|
|
|
@ -12,14 +12,10 @@ module TestSessions
|
||||||
Chrome = Capybara::Session.new(:selenium_chrome, TestApp)
|
Chrome = Capybara::Session.new(:selenium_chrome, TestApp)
|
||||||
end
|
end
|
||||||
|
|
||||||
skipped_tests = []
|
skipped_tests = [:response_headers, :status_code, :trigger]
|
||||||
skipped_tests << :windows if ENV['TRAVIS'] && !ENV['WINDOW_TEST']
|
skipped_tests << :windows if ENV['TRAVIS'] && !ENV['WINDOW_TEST']
|
||||||
|
|
||||||
Capybara::SpecHelper.run_specs TestSessions::Chrome, "selenium_chrome", capybara_skip: [
|
Capybara::SpecHelper.run_specs TestSessions::Chrome, "selenium_chrome", capybara_skip: skipped_tests
|
||||||
:response_headers,
|
|
||||||
:status_code,
|
|
||||||
:trigger
|
|
||||||
] unless ENV['TRAVIS'] && (RUBY_PLATFORM == 'java')
|
|
||||||
|
|
||||||
RSpec.describe "Capybara::Session with chrome" do
|
RSpec.describe "Capybara::Session with chrome" do
|
||||||
include_examples "Capybara::Session", TestSessions::Chrome, :selenium_chrome
|
include_examples "Capybara::Session", TestSessions::Chrome, :selenium_chrome
|
||||||
|
|
Loading…
Reference in a new issue