Download as
Browse Code »

Commit 454d127aec4ab2d1d70124d4db84cc834367ba85

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

rspec-rails updated

Showing 2 changed files with 19 additions and 18 deletions   Show diff stats
Gemfile
  Diff comments   View file @454d127
... ... @@ -76,7 +76,7 @@ end
76 76  
77 77 group :development, :test do
78 78 # Test framework
79   - gem 'rspec-rails', '~> 3.1.0'
  79 + gem 'rspec-rails', '~> 3.2.0'
80 80  
81 81 # Fixtures made easy
82 82 gem 'factory_girl_rails', '~> 4.5.0'
... ...
Gemfile.lock
  Diff comments   View file @454d127
... ... @@ -173,7 +173,7 @@ GEM
173 173 multi_json (~> 1.0)
174 174 websocket-driver (>= 0.2.0)
175 175 rack (1.5.2)
176   - rack-test (0.6.2)
  176 + rack-test (0.6.3)
177 177 rack (>= 1.0)
178 178 rails (4.1.8)
179 179 actionmailer (= 4.1.8)
... ... @@ -199,22 +199,23 @@ GEM
199 199 rest-client (1.7.2)
200 200 mime-types (>= 1.16, < 3.0)
201 201 netrc (~> 0.7)
202   - rspec-core (3.1.7)
203   - rspec-support (~> 3.1.0)
204   - rspec-expectations (3.1.2)
  202 + rspec-core (3.2.0)
  203 + rspec-support (~> 3.2.0)
  204 + rspec-expectations (3.2.0)
205 205 diff-lcs (>= 1.2.0, < 2.0)
206   - rspec-support (~> 3.1.0)
207   - rspec-mocks (3.1.3)
208   - rspec-support (~> 3.1.0)
209   - rspec-rails (3.1.0)
210   - actionpack (>= 3.0)
211   - activesupport (>= 3.0)
212   - railties (>= 3.0)
213   - rspec-core (~> 3.1.0)
214   - rspec-expectations (~> 3.1.0)
215   - rspec-mocks (~> 3.1.0)
216   - rspec-support (~> 3.1.0)
217   - rspec-support (3.1.2)
  206 + rspec-support (~> 3.2.0)
  207 + rspec-mocks (3.2.0)
  208 + diff-lcs (>= 1.2.0, < 2.0)
  209 + rspec-support (~> 3.2.0)
  210 + rspec-rails (3.2.0)
  211 + actionpack (>= 3.0, <= 4.2)
  212 + activesupport (>= 3.0, <= 4.2)
  213 + railties (>= 3.0, <= 4.2)
  214 + rspec-core (~> 3.2.0)
  215 + rspec-expectations (~> 3.2.0)
  216 + rspec-mocks (~> 3.2.0)
  217 + rspec-support (~> 3.2.0)
  218 + rspec-support (3.2.1)
218 219 sass (3.2.19)
219 220 sass-rails (4.0.5)
220 221 railties (>= 4.0.0, < 5.0)
... ... @@ -300,7 +301,7 @@ DEPENDENCIES
300 301 pg (~> 0.17.0)
301 302 poltergeist (~> 1.5.0)
302 303 rails (= 4.1.8)
303   - rspec-rails (~> 3.1.0)
  304 + rspec-rails (~> 3.2.0)
304 305 sass-rails (~> 4.0.1)
305 306 sdoc
306 307 shoulda-matchers (~> 2.7.0)
... ...