Skip to content

Commit b9ea0b5

Browse files
Judahmeekjustin808
authored andcommitted
Fix travis (shakacode#437)
* test stripping out poltergeist * restrict test suite * log versions * make sure chrome is latest version
1 parent 6e76a68 commit b9ea0b5

File tree

4 files changed

+11
-137
lines changed

4 files changed

+11
-137
lines changed

.travis.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language:
22
- ruby
33
rvm:
44
- 2.4.1
5-
sudo: false
5+
sudo: true
66
notifications:
77
slack: shakacode:YvfXbuFMcFAHt6ZjABIs0KET
88
addons:
@@ -17,18 +17,20 @@ env:
1717
global:
1818
- RAILS_ENV=test
1919
- CXX=g++-4.9
20-
before_install:
21-
- mkdir $PWD/travis-phantomjs
22-
- curl -sSL https://github.com/Medium/phantomjs/releases/download/v2.1.1/phantomjs-2.1.1-linux-x86_64.tar.bz2 -o $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
23-
- tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
24-
- export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
2520
install:
2621
- bundle install
2722
- chromedriver-update
23+
- wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
24+
- sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
25+
- sudo apt-get update
26+
- sudo apt-get install google-chrome-stable
2827
- nvm install stable && nvm alias default stable
29-
- npm install -g npm@5.3.x
28+
- npm install -g npm@5.6.x
3029
- npm install -g yarn
30+
- node --version
3131
- npm --version
32+
- google-chrome --version
33+
- chromedriver --version
3234
- yarn install
3335
- rake db:setup
3436

spec/rails_helper.rb

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
require "rspec/rails"
99
require "capybara/rspec"
10-
require "capybara/poltergeist"
1110
require "capybara-screenshot/rspec"
1211
require "database_cleaner"
1312

@@ -51,9 +50,7 @@
5150

5251
default_driver = :selenium_chrome
5352

54-
supported_drivers = %i[ poltergeist poltergeist_errors_ok
55-
poltergeist_no_animations webkit
56-
selenium_chrome selenium_firefox selenium]
53+
supported_drivers = %i[selenium_chrome selenium_firefox selenium]
5754
driver = ENV["DRIVER"].try(:to_sym) || default_driver
5855
Capybara.default_driver = driver
5956

@@ -62,39 +59,6 @@
6259
end
6360

6461
case driver
65-
when :poltergeist, :poltergeist_errors_ok, :poltergeist_no_animations
66-
basic_opts = {
67-
window_size: [1300, 1800],
68-
screen_size: [1400, 1900],
69-
phantomjs_options: ["--load-images=no", "--ignore-ssl-errors=true"],
70-
timeout: 180
71-
}
72-
73-
Capybara.register_driver :poltergeist do |app|
74-
Capybara::Poltergeist::Driver.new(app, basic_opts)
75-
end
76-
77-
no_animation_opts = basic_opts.merge( # Leaving animations off, as a sleep was still needed.
78-
extensions: ["#{Rails.root}/spec/support/phantomjs-disable-animations.js"]
79-
)
80-
81-
Capybara.register_driver :poltergeist_no_animations do |app|
82-
Capybara::Poltergeist::Driver.new(app, no_animation_opts)
83-
end
84-
85-
Capybara.register_driver :poltergeist_errors_ok do |app|
86-
Capybara::Poltergeist::Driver.new(app, no_animation_opts.merge(js_errors: false))
87-
end
88-
Capybara::Screenshot.register_driver(:poltergeist) do |js_driver, path|
89-
js_driver.browser.save_screenshot(path)
90-
end
91-
Capybara::Screenshot.register_driver(:poltergeist_no_animations) do |js_driver, path|
92-
js_driver.render(path, full: true)
93-
end
94-
Capybara::Screenshot.register_driver(:poltergeist_errors_ok) do |js_driver, path|
95-
js_driver.render(path, full: true)
96-
end
97-
9862
when :selenium_chrome
9963
DriverRegistration.register_selenium_chrome
10064
when :selenium_firefox, :selenium

spec/spec_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
# Show retry status in spec process
4141
config.verbose_retry = true
4242
# Try twice (retry once)
43-
config.default_retry_count = 4
43+
config.default_retry_count = 2
4444
# Only retry when Selenium raises Net::ReadTimeout
4545
# config.exceptions_to_retry = [Net::ReadTimeout]
4646
end

spec/support/poltergeist.rb

Lines changed: 0 additions & 92 deletions
This file was deleted.

0 commit comments

Comments
 (0)