Download as
Browse Code »

Commit bc21a74d39da960560088896768a87d5448e0615

Authored by Renan Fichberg
Committed by Rafael Manzo
1 parent 8bf21828
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

rspec updated to v3

Showing 2 changed files with 15 additions and 13 deletions   Show diff stats
Gemfile
  Diff comments   View file @bc21a74
... ... @@ -70,7 +70,7 @@ end
70 70  
71 71 group :development, :test do
72 72 # Test framework
73   - gem 'rspec-rails', '~> 2.99.0'
  73 + gem 'rspec-rails', '~> 3.0.1'
74 74  
75 75 # Fixtures made easy
76 76 gem 'factory_girl_rails', '~> 4.4.1'
... ...
Gemfile.lock
  Diff comments   View file @bc21a74
... ... @@ -192,20 +192,22 @@ GEM
192 192 mime-types (>= 1.16, < 3.0)
193 193 netrc (~> 0.7)
194 194 rspec-collection_matchers (1.0.0)
195   - rspec-expectations (>= 2.99.0.beta1)
196   - rspec-core (2.99.1)
197   - rspec-expectations (2.99.1)
198   - diff-lcs (>= 1.1.3, < 2.0)
199   - rspec-mocks (2.99.1)
200   - rspec-rails (2.99.0)
  195 + rspec-core (3.0.0)
  196 + rspec-support (~> 3.0.0)
  197 + rspec-expectations (3.0.0)
  198 + diff-lcs (>= 1.2.0, < 2.0)
  199 + rspec-support (~> 3.0.0)
  200 + rspec-mocks (3.0.0)
  201 + rspec-support (~> 3.0.0)
  202 + rspec-rails (3.0.1)
201 203 actionpack (>= 3.0)
202   - activemodel (>= 3.0)
203 204 activesupport (>= 3.0)
204 205 railties (>= 3.0)
205   - rspec-collection_matchers
206   - rspec-core (~> 2.99.0)
207   - rspec-expectations (~> 2.99.0)
208   - rspec-mocks (~> 2.99.0)
  206 + rspec-core (~> 3.0.0)
  207 + rspec-expectations (~> 3.0.0)
  208 + rspec-mocks (~> 3.0.0)
  209 + rspec-support (~> 3.0.0)
  210 + rspec-support (3.0.0)
209 211 sass (3.2.19)
210 212 sass-rails (4.0.3)
211 213 railties (>= 4.0.0, < 5.0)
... ... @@ -290,7 +292,7 @@ DEPENDENCIES
290 292 pg (~> 0.17.0)
291 293 poltergeist (~> 1.5.0)
292 294 rails (= 4.1.4)
293   - rspec-rails (~> 2.99.0)
  295 + rspec-rails (~> 3.0.1)
294 296 sass-rails (~> 4.0.1)
295 297 sdoc
296 298 shoulda-matchers (~> 2.6.1)
... ...