bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Fix for PhantomJS 2.1.1

Browse Source
This commit is contained in:
Godwin 2017-04-13 20:43:13 -07:00
parent fe02ee4b6e
commit b098a274a8
2 changed files with 71 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
Gemfile.lock
View File

@ -1,38 +1,3 @@
GIT
remote: https://github.com/bikebike/bikecollectives_core.git
revision: 3c9c6ac9fb3da839c945fd851f9ab255361ad296
specs:
bikecollectives_core (0.1.0)
activerecord-session_store
carrierwave
carrierwave-imageoptimizer
haml
launchy
letter_opener
mini_magick
pg
premailer-rails
rails (~> 4.2.0)
redcarpet
sass
sass-json-vars
sass-rails
sidekiq
uglifier (>= 1.3.0)
GIT
remote: https://github.com/bumbleberry/bumbleberry.git
revision: 3b990baa3b5a30dbe378144ed97f0717f910f5f8
branch: 2017
specs:
bumbleberry (0.0.1)
blockspring
cairo
railties
rsvg2
sass-json-vars
sass-rails
GIT GIT
remote: https://github.com/glebm/to_spreadsheet.git remote: https://github.com/glebm/to_spreadsheet.git
revision: 4c08455646dd18de51cc1ec05717fbb240c78a68 revision: 4c08455646dd18de51cc1ec05717fbb240c78a68
@ -61,9 +26,49 @@ GIT
eventmachine (1.2.1) eventmachine (1.2.1)
GIT GIT
remote: https://github.com/lingua-franca/lingua_franca.git remote: https://github.com/tg90nor/sorcery.git
revision: fd783d6fa288e8867c648b62e6b5e63926023440 revision: 79b69a87ce168c47fab76921874aa7e8cb727002
branch: 2017 branch: make-facebook-provider-use-json-token-parser
specs:
sorcery (0.10.3)
bcrypt (~> 3.1)
oauth (~> 0.4, >= 0.4.4)
oauth2 (~> 1.0, >= 0.8.0)
PATH
remote: ../bikecollectives_core
specs:
bikecollectives_core (0.1.0)
activerecord-session_store
carrierwave
carrierwave-imageoptimizer
haml
launchy
letter_opener
mini_magick
pg
premailer-rails
rails (~> 4.2.0)
redcarpet
sass
sass-json-vars
sass-rails
sidekiq
uglifier (>= 1.3.0)
PATH
remote: ../bumbleberry
specs:
bumbleberry (0.0.1)
blockspring
cairo
railties
rsvg2
sass-json-vars
sass-rails
PATH
remote: ../lingua_franca
specs: specs:
lingua_franca (0.0.1) lingua_franca (0.0.1)
diffy diffy
@ -74,23 +79,12 @@ GIT
rails-i18n rails-i18n
rubyzip rubyzip
GIT PATH
remote: https://github.com/lingua-franca/marmara.git remote: ../marmara
revision: 76e2406fcdb793e6ca1946e5d3f9125cf0076485
specs: specs:
marmara (1.0.2) marmara (1.0.2)
css_parser (>= 1.5.0.pre) css_parser (>= 1.5.0.pre)
GIT
remote: https://github.com/tg90nor/sorcery.git
revision: 79b69a87ce168c47fab76921874aa7e8cb727002
branch: make-facebook-provider-use-json-token-parser
specs:
sorcery (0.10.3)
bcrypt (~> 3.1)
oauth (~> 0.4, >= 0.4.4)
oauth2 (~> 1.0, >= 0.8.0)
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
@ -156,7 +150,7 @@ GEM
blockspring (0.1.4) blockspring (0.1.4)
rest-client (> 1.6.7) rest-client (> 1.6.7)
builder (3.2.3) builder (3.2.3)
cairo (1.15.5) cairo (1.15.5-x86-mingw32)
pkg-config (>= 1.1.5) pkg-config (>= 1.1.5)
callsite (0.0.11) callsite (0.0.11)
capistrano (3.8.0) capistrano (3.8.0)
@ -242,22 +236,24 @@ GEM
faraday (0.11.0) faraday (0.11.0)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
ffi (1.9.18) ffi (1.9.18)
ffi (1.9.18-x86-mingw32)
forgery (0.6.0) forgery (0.6.0)
formatador (0.2.5) formatador (0.2.5)
gdk_pixbuf2 (3.1.1) gdk_pixbuf2 (3.1.1-x86-mingw32)
gio2 (= 3.1.1) gio2 (= 3.1.1)
geocoder (1.4.3) geocoder (1.4.3)
gherkin (4.1.1) gherkin (4.1.1)
gherkin3 (3.1.2) gherkin3 (3.1.2)
gio2 (3.1.1) gio2 (3.1.1-x86-mingw32)
glib2 (= 3.1.1) glib2 (= 3.1.1)
gobject-introspection (= 3.1.1) gobject-introspection (= 3.1.1)
git-version-bump (0.15.1) git-version-bump (0.15.1)
glib2 (3.1.1) glib2 (3.1.1-x86-mingw32)
cairo (>= 1.12.8)
pkg-config pkg-config
globalid (0.3.7) globalid (0.3.7)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
gobject-introspection (3.1.1) gobject-introspection (3.1.1-x86-mingw32)
glib2 (= 3.1.1) glib2 (= 3.1.1)
guard (2.14.1) guard (2.14.1)
formatador (>= 0.2.4) formatador (>= 0.2.4)
@ -335,6 +331,8 @@ GEM
netrc (0.11.0) netrc (0.11.0)
nokogiri (1.6.8.1) nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.1.0)
nokogiri (1.6.8.1-x86-mingw32)
mini_portile2 (~> 2.1.0)
notiffany (0.1.1) notiffany (0.1.1)
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
@ -345,9 +343,13 @@ GEM
multi_json (~> 1.3) multi_json (~> 1.3)
multi_xml (~> 0.5) multi_xml (~> 0.5)
rack (>= 1.2, < 3) rack (>= 1.2, < 3)
pango (3.1.1-x86-mingw32)
cairo (>= 1.14.0)
glib2 (= 3.1.1)
parser (2.4.0.0) parser (2.4.0.0)
ast (~> 2.2) ast (~> 2.2)
pg (0.20.0) pg (0.20.0)
pg (0.20.0-x86-mingw32)
pkg-config (1.1.7) pkg-config (1.1.7)
poltergeist (1.14.0) poltergeist (1.14.0)
capybara (~> 2.1) capybara (~> 2.1)
@ -422,6 +424,11 @@ GEM
http-cookie (>= 1.0.2, < 2.0) http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0) mime-types (>= 1.16, < 4.0)
netrc (~> 0.8) netrc (~> 0.8)
rest-client (2.0.1-x86-mingw32)
ffi (~> 1.9)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rspec (3.5.0) rspec (3.5.0)
rspec-core (~> 3.5.0) rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0) rspec-expectations (~> 3.5.0)
@ -443,9 +450,10 @@ GEM
rspec-mocks (~> 3.5.0) rspec-mocks (~> 3.5.0)
rspec-support (~> 3.5.0) rspec-support (~> 3.5.0)
rspec-support (3.5.0) rspec-support (3.5.0)
rsvg2 (3.1.1) rsvg2 (3.1.1-x86-mingw32)
cairo (>= 1.12.8) cairo (>= 1.12.8)
gdk_pixbuf2 (= 3.1.1) gdk_pixbuf2 (= 3.1.1)
pango (>= 3.1.1)
rubocop (0.48.1) rubocop (0.48.1)
parser (>= 2.3.3.1, < 3.0) parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1) powerpack (~> 0.1)
@ -513,10 +521,12 @@ GEM
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
unf_ext (0.0.7.3) unf_ext (0.0.7.3)
unf_ext (0.0.7.3-x86-mingw32)
unicode-display_width (1.2.1) unicode-display_width (1.2.1)
unicorn (5.3.0) unicorn (5.3.0)
kgio (~> 2.6) kgio (~> 2.6)
raindrops (~> 0.7) raindrops (~> 0.7)
wdm (0.1.1)
webmock (2.3.2) webmock (2.3.2)
addressable (>= 2.3.6) addressable (>= 2.3.6)
crack (>= 0.3.2) crack (>= 0.3.2)
@ -525,11 +535,13 @@ GEM
websocket-driver (0.6.5) websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2) websocket-extensions (0.1.2)
win32console (1.3.2-x86-mingw32)
xpath (2.0.0) xpath (2.0.0)
nokogiri (~> 1.3) nokogiri (~> 1.3)
PLATFORMS PLATFORMS
ruby ruby
x86-mingw32
DEPENDENCIES DEPENDENCIES
activerecord-session_store activerecord-session_store
@ -597,4 +609,4 @@ DEPENDENCIES
win32console win32console
BUNDLED WITH BUNDLED WITH
1.12.3 1.14.4

2
features/support/env.rb
View File

@ -42,7 +42,7 @@ Before do
safari5 = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; de-at) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1" safari5 = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; de-at) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1"
safari9 = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.75.14 (KHTML, like Gecko) Version/9.3.2 Safari/537.75.14" safari9 = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.75.14 (KHTML, like Gecko) Version/9.3.2 Safari/537.75.14"
chrome55 = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36" chrome55 = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36"
ActionDispatch::Request.any_instance.stubs(:user_agent).returns(safari9) ActionDispatch::Request.any_instance.stubs(:user_agent).returns(safari5)
LinguaFranca.test_driver = page.driver LinguaFranca.test_driver = page.driver
host = "http://#{Capybara.current_session.server.host}:#{Capybara.current_session.server.port}" host = "http://#{Capybara.current_session.server.host}:#{Capybara.current_session.server.port}"
LinguaFranca.host = host LinguaFranca.host = host