Download as
Browse Code »

Commit 2b64da5f609ad05e4beb13cf32bf0ce87dd8614b

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

Trannsitory package to rspec 3

Showing 2 changed files with 13 additions and 10 deletions   Show diff stats
Gemfile
  Diff comments   View file @2b64da5
... ... @@ -70,7 +70,7 @@ end
70 70  
71 71 group :development, :test do
72 72 # Test framework
73   - gem 'rspec-rails'
  73 + gem 'rspec-rails', '~> 2.99.0'
74 74  
75 75 # Fixtures made easy
76 76 gem 'factory_girl_rails', '~> 4.4.1'
... ...
Gemfile.lock
  Diff comments   View file @2b64da5
... ... @@ -189,18 +189,21 @@ GEM
189 189 ref (1.0.5)
190 190 rest-client (1.6.7)
191 191 mime-types (>= 1.16)
192   - rspec-core (2.14.8)
193   - rspec-expectations (2.14.5)
  192 + rspec-collection_matchers (0.0.4)
  193 + rspec-expectations (>= 2.99.0.beta1)
  194 + rspec-core (2.99.0)
  195 + rspec-expectations (2.99.0)
194 196 diff-lcs (>= 1.1.3, < 2.0)
195   - rspec-mocks (2.14.6)
196   - rspec-rails (2.14.2)
  197 + rspec-mocks (2.99.0)
  198 + rspec-rails (2.99.0)
197 199 actionpack (>= 3.0)
198 200 activemodel (>= 3.0)
199 201 activesupport (>= 3.0)
200 202 railties (>= 3.0)
201   - rspec-core (~> 2.14.0)
202   - rspec-expectations (~> 2.14.0)
203   - rspec-mocks (~> 2.14.0)
  203 + rspec-collection_matchers
  204 + rspec-core (~> 2.99.0)
  205 + rspec-expectations (~> 2.99.0)
  206 + rspec-mocks (~> 2.99.0)
204 207 sass (3.2.19)
205 208 sass-rails (4.0.3)
206 209 railties (>= 4.0.0, < 5.0)
... ... @@ -246,7 +249,7 @@ GEM
246 249 polyglot (>= 0.3.1)
247 250 turbolinks (2.2.2)
248 251 coffee-rails
249   - tzinfo (1.2.0)
  252 + tzinfo (1.2.1)
250 253 thread_safe (~> 0.1)
251 254 uglifier (2.5.0)
252 255 execjs (>= 0.3.0)
... ... @@ -285,7 +288,7 @@ DEPENDENCIES
285 288 pg (~> 0.17.0)
286 289 poltergeist (~> 1.5.0)
287 290 rails (= 4.1.2.rc1)
288   - rspec-rails
  291 + rspec-rails (~> 2.99.0)
289 292 sass-rails (~> 4.0.1)
290 293 sdoc
291 294 shoulda-matchers (~> 2.6.1)
... ...