Download as
Browse Code »

Commit ac5b7b87684aeaa5985ed45620918cc9f4a45490

Authored by Rafael Manzo
1 parent c41f265f
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Updated poltergeist from 1.3.0 to 1.4.0

Showing 2 changed files with 8 additions and 9 deletions   Show diff stats
Gemfile
  Diff comments   View file @ac5b7b8
... ... @@ -76,7 +76,7 @@ group :cucumber do
76 76 #Fixed the cumcumber version since the version 1.3.4 causes tests failure
77 77 gem 'cucumber', '1.3.2'
78 78 gem 'database_cleaner'
79   - gem 'poltergeist', '~> 1.3.0'
  79 + gem 'poltergeist', '~> 1.4.0'
80 80 end
81 81  
82 82 # Use ActiveModel has_secure_password
... ...
Gemfile.lock
  Diff comments   View file @ac5b7b8
... ... @@ -52,6 +52,7 @@ GEM
52 52 rack (>= 1.0.0)
53 53 rack-test (>= 0.5.4)
54 54 xpath (~> 2.0)
  55 + cliver (0.2.1)
55 56 coffee-rails (4.0.0)
56 57 coffee-script (>= 2.2.0)
57 58 railties (>= 4.0.0.beta, < 5.0)
... ... @@ -77,22 +78,18 @@ GEM
77 78 warden (~> 1.2.3)
78 79 diff-lcs (1.2.4)
79 80 erubis (2.7.0)
80   - eventmachine (1.0.3)
81 81 execjs (2.0.1)
82 82 factory_girl (4.2.0)
83 83 activesupport (>= 3.0.0)
84 84 factory_girl_rails (4.2.1)
85 85 factory_girl (~> 4.2.0)
86 86 railties (>= 3.0.0)
87   - faye-websocket (0.4.7)
88   - eventmachine (>= 0.12.0)
89 87 gherkin (2.12.1)
90 88 multi_json (~> 1.3)
91 89 gyoku (1.1.0)
92 90 builder (>= 2.1.2)
93 91 highline (1.6.19)
94 92 hike (1.2.3)
95   - http_parser.rb (0.5.3)
96 93 httpi (2.1.0)
97 94 rack
98 95 rubyntlm (~> 0.3.2)
... ... @@ -126,10 +123,11 @@ GEM
126 123 nori (2.3.0)
127 124 orm_adapter (0.4.0)
128 125 pg (0.16.0)
129   - poltergeist (1.3.0)
  126 + poltergeist (1.4.0)
130 127 capybara (~> 2.1.0)
131   - faye-websocket (>= 0.4.4, < 0.5.0)
132   - http_parser.rb (~> 0.5.3)
  128 + cliver (~> 0.2.1)
  129 + multi_json (~> 1.0)
  130 + websocket-driver (>= 0.2.0)
133 131 polyglot (0.3.3)
134 132 rack (1.5.2)
135 133 rack-test (0.6.2)
... ... @@ -218,6 +216,7 @@ GEM
218 216 wasabi (3.2.0)
219 217 httpi (~> 2.0)
220 218 nokogiri (>= 1.4.0, < 1.6)
  219 + websocket-driver (0.2.3)
221 220 xpath (2.0.0)
222 221 nokogiri (~> 1.3)
223 222  
... ... @@ -238,7 +237,7 @@ DEPENDENCIES
238 237 mocha
239 238 modernizr-rails
240 239 pg (~> 0.16.0)
241   - poltergeist (~> 1.3.0)
  240 + poltergeist (~> 1.4.0)
242 241 rails (= 4.0.0)
243 242 rspec-rails
244 243 rvm-capistrano
... ...