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
@@ -70,7 +70,7 @@ end @@ -70,7 +70,7 @@ end
70 70
71 group :development, :test do 71 group :development, :test do
72 # Test framework 72 # Test framework
73 - gem 'rspec-rails' 73 + gem 'rspec-rails', '~> 2.99.0'
74 74
75 # Fixtures made easy 75 # Fixtures made easy
76 gem 'factory_girl_rails', '~> 4.4.1' 76 gem 'factory_girl_rails', '~> 4.4.1'
@@ -189,18 +189,21 @@ GEM @@ -189,18 +189,21 @@ GEM
189 ref (1.0.5) 189 ref (1.0.5)
190 rest-client (1.6.7) 190 rest-client (1.6.7)
191 mime-types (>= 1.16) 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 diff-lcs (>= 1.1.3, < 2.0) 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 actionpack (>= 3.0) 199 actionpack (>= 3.0)
198 activemodel (>= 3.0) 200 activemodel (>= 3.0)
199 activesupport (>= 3.0) 201 activesupport (>= 3.0)
200 railties (>= 3.0) 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 sass (3.2.19) 207 sass (3.2.19)
205 sass-rails (4.0.3) 208 sass-rails (4.0.3)
206 railties (>= 4.0.0, < 5.0) 209 railties (>= 4.0.0, < 5.0)
@@ -246,7 +249,7 @@ GEM @@ -246,7 +249,7 @@ GEM
246 polyglot (>= 0.3.1) 249 polyglot (>= 0.3.1)
247 turbolinks (2.2.2) 250 turbolinks (2.2.2)
248 coffee-rails 251 coffee-rails
249 - tzinfo (1.2.0) 252 + tzinfo (1.2.1)
250 thread_safe (~> 0.1) 253 thread_safe (~> 0.1)
251 uglifier (2.5.0) 254 uglifier (2.5.0)
252 execjs (>= 0.3.0) 255 execjs (>= 0.3.0)
@@ -285,7 +288,7 @@ DEPENDENCIES @@ -285,7 +288,7 @@ DEPENDENCIES
285 pg (~> 0.17.0) 288 pg (~> 0.17.0)
286 poltergeist (~> 1.5.0) 289 poltergeist (~> 1.5.0)
287 rails (= 4.1.2.rc1) 290 rails (= 4.1.2.rc1)
288 - rspec-rails 291 + rspec-rails (~> 2.99.0)
289 sass-rails (~> 4.0.1) 292 sass-rails (~> 4.0.1)
290 sdoc 293 sdoc
291 shoulda-matchers (~> 2.6.1) 294 shoulda-matchers (~> 2.6.1)