Permalink
Browse files

Update mocha version dependency and require mocha/api

[Closes #470]
  • Loading branch information...
1 parent bf29843 commit 854ea5bdf7986d48ab7d8c9cb2aa8687498c1f1a @joshuaclayton joshuaclayton committed Jan 18, 2013
Showing with 67 additions and 67 deletions.
  1. +13 −13 Gemfile.lock
  2. +2 −2 factory_girl.gemspec
  3. +21 −21 gemfiles/3.0.gemfile.lock
  4. +15 −15 gemfiles/3.1.gemfile.lock
  5. +15 −15 gemfiles/3.2.gemfile.lock
  6. +1 −1 spec/spec_helper.rb
View
26 Gemfile.lock
@@ -27,8 +27,8 @@ GEM
cucumber (>= 1.1.1)
ffi (>= 1.0.11)
rspec (>= 2.7.0)
- bourne (1.1.2)
- mocha (= 0.10.5)
+ bourne (1.3.0)
+ mocha (= 0.13.0)
builder (3.0.4)
childprocess (0.3.2)
ffi (~> 1.0.6)
@@ -48,23 +48,23 @@ GEM
json (1.7.5)
json (1.7.5-java)
metaclass (0.0.1)
- mocha (0.10.5)
+ mocha (0.13.0)
metaclass (~> 0.0.1)
multi_json (1.3.4)
rake (0.9.2.2)
- rspec (2.11.0)
- rspec-core (~> 2.11.0)
- rspec-expectations (~> 2.11.0)
- rspec-mocks (~> 2.11.0)
- rspec-core (2.11.1)
- rspec-expectations (2.11.2)
+ rspec (2.12.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
+ rspec-core (2.12.2)
+ rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.11.1)
+ rspec-mocks (2.12.1)
simplecov (0.6.2)
multi_json (~> 1.3)
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
- sqlite3 (1.3.6)
+ sqlite3 (1.3.7)
timecop (0.3.5)
tzinfo (0.3.33)
yard (0.8.1)
@@ -80,8 +80,8 @@ DEPENDENCIES
bourne
cucumber (~> 1.2.1)
factory_girl!
- mocha
- rspec (~> 2.11.0)
+ mocha (>= 0.12.8)
+ rspec (~> 2.12.0)
simplecov
sqlite3
timecop
View
4 factory_girl.gemspec
@@ -23,12 +23,12 @@ Gem::Specification.new do |s|
s.add_dependency("activesupport", ">= 3.0.0")
- s.add_development_dependency("rspec", "~> 2.11.0")
+ s.add_development_dependency("rspec", "~> 2.12.0")
s.add_development_dependency("cucumber", "~> 1.2.1")
s.add_development_dependency("timecop")
s.add_development_dependency("simplecov")
s.add_development_dependency("aruba")
- s.add_development_dependency("mocha")
+ s.add_development_dependency("mocha", ">= 0.12.8")
s.add_development_dependency("bourne")
s.add_development_dependency("appraisal", "~> 0.5.1")
View
42 gemfiles/3.0.gemfile.lock
@@ -7,16 +7,16 @@ PATH
GEM
remote: http://rubygems.org/
specs:
- activemodel (3.0.18)
- activesupport (= 3.0.18)
+ activemodel (3.0.19)
+ activesupport (= 3.0.19)
builder (~> 2.1.2)
i18n (~> 0.5.0)
- activerecord (3.0.18)
- activemodel (= 3.0.18)
- activesupport (= 3.0.18)
+ activerecord (3.0.19)
+ activemodel (= 3.0.19)
+ activesupport (= 3.0.19)
arel (~> 2.0.10)
tzinfo (~> 0.3.23)
- activesupport (3.0.18)
+ activesupport (3.0.19)
appraisal (0.5.1)
bundler
rake
@@ -25,8 +25,8 @@ GEM
childprocess (~> 0.3.6)
cucumber (>= 1.1.1)
rspec-expectations (>= 2.7.0)
- bourne (1.2.0)
- mocha (= 0.12.3)
+ bourne (1.3.0)
+ mocha (= 0.13.0)
builder (2.1.2)
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
@@ -36,30 +36,30 @@ GEM
gherkin (~> 2.11.0)
json (>= 1.4.6)
diff-lcs (1.1.3)
- ffi (1.2.0)
+ ffi (1.3.1)
gherkin (2.11.5)
json (>= 1.4.6)
i18n (0.5.0)
json (1.7.6)
metaclass (0.0.1)
- mocha (0.12.3)
+ mocha (0.13.0)
metaclass (~> 0.0.1)
multi_json (1.5.0)
rake (10.0.3)
- rspec (2.11.0)
- rspec-core (~> 2.11.0)
- rspec-expectations (~> 2.11.0)
- rspec-mocks (~> 2.11.0)
- rspec-core (2.11.1)
- rspec-expectations (2.11.3)
+ rspec (2.12.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
+ rspec-core (2.12.2)
+ rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.11.3)
+ rspec-mocks (2.12.1)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
- sqlite3 (1.3.6)
- timecop (0.5.3)
+ sqlite3 (1.3.7)
+ timecop (0.5.9)
tzinfo (0.3.35)
yard (0.8.3)
@@ -73,8 +73,8 @@ DEPENDENCIES
bourne
cucumber (~> 1.2.1)
factory_girl!
- mocha
- rspec (~> 2.11.0)
+ mocha (>= 0.12.8)
+ rspec (~> 2.12.0)
simplecov
sqlite3
timecop
View
30 gemfiles/3.1.gemfile.lock
@@ -26,8 +26,8 @@ GEM
childprocess (~> 0.3.6)
cucumber (>= 1.1.1)
rspec-expectations (>= 2.7.0)
- bourne (1.2.0)
- mocha (= 0.12.3)
+ bourne (1.3.0)
+ mocha (= 0.13.0)
builder (3.0.4)
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
@@ -37,30 +37,30 @@ GEM
gherkin (~> 2.11.0)
json (>= 1.4.6)
diff-lcs (1.1.3)
- ffi (1.2.0)
+ ffi (1.3.1)
gherkin (2.11.5)
json (>= 1.4.6)
i18n (0.6.1)
json (1.7.6)
metaclass (0.0.1)
- mocha (0.12.3)
+ mocha (0.13.0)
metaclass (~> 0.0.1)
multi_json (1.2.0)
rake (10.0.3)
- rspec (2.11.0)
- rspec-core (~> 2.11.0)
- rspec-expectations (~> 2.11.0)
- rspec-mocks (~> 2.11.0)
- rspec-core (2.11.1)
- rspec-expectations (2.11.3)
+ rspec (2.12.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
+ rspec-core (2.12.2)
+ rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.11.3)
+ rspec-mocks (2.12.1)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
- sqlite3 (1.3.6)
- timecop (0.5.3)
+ sqlite3 (1.3.7)
+ timecop (0.5.9)
tzinfo (0.3.35)
yard (0.8.3)
@@ -74,8 +74,8 @@ DEPENDENCIES
bourne
cucumber (~> 1.2.1)
factory_girl!
- mocha
- rspec (~> 2.11.0)
+ mocha (>= 0.12.8)
+ rspec (~> 2.12.0)
simplecov
sqlite3
timecop
View
30 gemfiles/3.2.gemfile.lock
@@ -26,8 +26,8 @@ GEM
childprocess (~> 0.3.6)
cucumber (>= 1.1.1)
rspec-expectations (>= 2.7.0)
- bourne (1.2.0)
- mocha (= 0.12.3)
+ bourne (1.3.0)
+ mocha (= 0.13.0)
builder (3.0.4)
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
@@ -37,30 +37,30 @@ GEM
gherkin (~> 2.11.0)
json (>= 1.4.6)
diff-lcs (1.1.3)
- ffi (1.2.0)
+ ffi (1.3.1)
gherkin (2.11.5)
json (>= 1.4.6)
i18n (0.6.1)
json (1.7.6)
metaclass (0.0.1)
- mocha (0.12.3)
+ mocha (0.13.0)
metaclass (~> 0.0.1)
multi_json (1.5.0)
rake (10.0.3)
- rspec (2.11.0)
- rspec-core (~> 2.11.0)
- rspec-expectations (~> 2.11.0)
- rspec-mocks (~> 2.11.0)
- rspec-core (2.11.1)
- rspec-expectations (2.11.3)
+ rspec (2.12.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
+ rspec-core (2.12.2)
+ rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.11.3)
+ rspec-mocks (2.12.1)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
- sqlite3 (1.3.6)
- timecop (0.5.3)
+ sqlite3 (1.3.7)
+ timecop (0.5.9)
tzinfo (0.3.35)
yard (0.8.3)
@@ -74,8 +74,8 @@ DEPENDENCIES
bourne
cucumber (~> 1.2.1)
factory_girl!
- mocha
- rspec (~> 2.11.0)
+ mocha (>= 0.12.8)
+ rspec (~> 2.12.0)
simplecov
sqlite3
timecop
View
2 spec/spec_helper.rb
@@ -8,7 +8,7 @@
require "simplecov"
require 'factory_girl'
-require "mocha"
+require "mocha/api"
require "bourne"
require "timecop"

0 comments on commit 854ea5b

Please sign in to comment.