From 3e56c697fe0d437d4289606ed5a8ef0ed506ffc5 Mon Sep 17 00:00:00 2001 From: Godwin Date: Thu, 13 Apr 2017 20:43:13 -0700 Subject: [PATCH] Fix for PhantomJS 2.1.1 --- Gemfile.lock | 126 ++++++++++++++++++++++------------------ features/support/env.rb | 2 +- 2 files changed, 70 insertions(+), 58 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 00ec58d..887aef1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,42 @@ GIT - remote: https://github.com/bikebike/bikecollectives_core.git - revision: 3c9c6ac9fb3da839c945fd851f9ab255361ad296 + remote: https://github.com/glebm/to_spreadsheet.git + revision: 4c08455646dd18de51cc1ec05717fbb240c78a68 + specs: + to_spreadsheet (1.0.6) + axlsx + chronic + nokogiri + rails + responders + +GIT + remote: https://github.com/ianfleeton/paypal-express + revision: e40cd3d41d1a5cdf6570332626afd9333fe576f9 + specs: + paypal-express (0.8.1) + activesupport (>= 2.3) + attr_required (>= 0.0.5) + rest-client + +GIT + remote: https://github.com/krzcho/eventmachine + revision: 651a35ee9df9826e048c3b3721e2c6b415c5a328 + branch: master + specs: + eventmachine (1.2.1) + +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) + +PATH + remote: ../bikecollectives_core specs: bikecollectives_core (0.1.0) activerecord-session_store @@ -20,10 +56,8 @@ GIT sidekiq uglifier (>= 1.3.0) -GIT - remote: https://github.com/bumbleberry/bumbleberry.git - revision: 3b990baa3b5a30dbe378144ed97f0717f910f5f8 - branch: 2017 +PATH + remote: ../bumbleberry specs: bumbleberry (0.0.1) blockspring @@ -33,37 +67,8 @@ GIT sass-json-vars sass-rails -GIT - remote: https://github.com/glebm/to_spreadsheet.git - revision: 4c08455646dd18de51cc1ec05717fbb240c78a68 - specs: - to_spreadsheet (1.0.6) - axlsx - chronic - nokogiri - rails - responders - -GIT - remote: https://github.com/ianfleeton/paypal-express - revision: e40cd3d41d1a5cdf6570332626afd9333fe576f9 - specs: - paypal-express (0.8.1) - activesupport (>= 2.3) - attr_required (>= 0.0.5) - rest-client - -GIT - remote: https://github.com/krzcho/eventmachine - revision: 651a35ee9df9826e048c3b3721e2c6b415c5a328 - branch: master - specs: - eventmachine (1.2.1) - -GIT - remote: https://github.com/lingua-franca/lingua_franca.git - revision: fd783d6fa288e8867c648b62e6b5e63926023440 - branch: 2017 +PATH + remote: ../lingua_franca specs: lingua_franca (0.0.1) diffy @@ -74,23 +79,12 @@ GIT rails-i18n rubyzip -GIT - remote: https://github.com/lingua-franca/marmara.git - revision: 76e2406fcdb793e6ca1946e5d3f9125cf0076485 +PATH + remote: ../marmara specs: marmara (1.0.2) 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 remote: http://rubygems.org/ specs: @@ -156,7 +150,7 @@ GEM blockspring (0.1.4) rest-client (> 1.6.7) builder (3.2.3) - cairo (1.15.5) + cairo (1.15.5-x86-mingw32) pkg-config (>= 1.1.5) callsite (0.0.11) capistrano (3.8.0) @@ -242,22 +236,24 @@ GEM faraday (0.11.0) multipart-post (>= 1.2, < 3) ffi (1.9.18) + ffi (1.9.18-x86-mingw32) forgery (0.6.0) formatador (0.2.5) - gdk_pixbuf2 (3.1.1) + gdk_pixbuf2 (3.1.1-x86-mingw32) gio2 (= 3.1.1) geocoder (1.4.3) gherkin (4.1.1) gherkin3 (3.1.2) - gio2 (3.1.1) + gio2 (3.1.1-x86-mingw32) glib2 (= 3.1.1) gobject-introspection (= 3.1.1) git-version-bump (0.15.1) - glib2 (3.1.1) + glib2 (3.1.1-x86-mingw32) + cairo (>= 1.12.8) pkg-config globalid (0.3.7) activesupport (>= 4.1.0) - gobject-introspection (3.1.1) + gobject-introspection (3.1.1-x86-mingw32) glib2 (= 3.1.1) guard (2.14.1) formatador (>= 0.2.4) @@ -335,6 +331,8 @@ GEM netrc (0.11.0) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) + nokogiri (1.6.8.1-x86-mingw32) + mini_portile2 (~> 2.1.0) notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) @@ -345,9 +343,13 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) + pango (3.1.1-x86-mingw32) + cairo (>= 1.14.0) + glib2 (= 3.1.1) parser (2.4.0.0) ast (~> 2.2) pg (0.20.0) + pg (0.20.0-x86-mingw32) pkg-config (1.1.7) poltergeist (1.14.0) capybara (~> 2.1) @@ -422,6 +424,11 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) 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-core (~> 3.5.0) rspec-expectations (~> 3.5.0) @@ -443,9 +450,10 @@ GEM rspec-mocks (~> 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) gdk_pixbuf2 (= 3.1.1) + pango (>= 3.1.1) rubocop (0.48.1) parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) @@ -513,10 +521,12 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.3) + unf_ext (0.0.7.3-x86-mingw32) unicode-display_width (1.2.1) unicorn (5.3.0) kgio (~> 2.6) raindrops (~> 0.7) + wdm (0.1.1) webmock (2.3.2) addressable (>= 2.3.6) crack (>= 0.3.2) @@ -525,11 +535,13 @@ GEM websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) + win32console (1.3.2-x86-mingw32) xpath (2.0.0) nokogiri (~> 1.3) PLATFORMS ruby + x86-mingw32 DEPENDENCIES activerecord-session_store @@ -597,4 +609,4 @@ DEPENDENCIES win32console BUNDLED WITH - 1.12.3 + 1.14.4 diff --git a/features/support/env.rb b/features/support/env.rb index 4033753..39e1252 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -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" 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" - ActionDispatch::Request.any_instance.stubs(:user_agent).returns(safari9) + ActionDispatch::Request.any_instance.stubs(:user_agent).returns(safari5) LinguaFranca.test_driver = page.driver host = "http://#{Capybara.current_session.server.host}:#{Capybara.current_session.server.port}" LinguaFranca.host = host