Use a version of mocha working with every rails version
This commit is contained in:
parent
cf9f0b5fbd
commit
22c80ffec9
8
Gemfile
8
Gemfile
|
@ -3,10 +3,10 @@ source :rubygems
|
|||
gemspec
|
||||
|
||||
gem 'country_select'
|
||||
gem 'railties', '~> 3.2.0', :github => 'rails/rails', :branch => '3-2-stable'
|
||||
gem 'activemodel', '~> 3.2.0', :github => 'rails/rails', :branch => '3-2-stable'
|
||||
gem 'actionpack', '~> 3.2.0', :github => 'rails/rails', :branch => '3-2-stable'
|
||||
gem 'railties', '~> 3.2.0'
|
||||
gem 'activemodel', '~> 3.2.0'
|
||||
gem 'actionpack', '~> 3.2.0'
|
||||
gem 'rake'
|
||||
gem 'rdoc'
|
||||
gem 'mocha', :require => false
|
||||
gem 'mocha', '~> 0.12.0', :require => false
|
||||
gem 'tzinfo'
|
||||
|
|
52
Gemfile.lock
52
Gemfile.lock
|
@ -1,7 +1,12 @@
|
|||
GIT
|
||||
remote: git://github.com/rails/rails.git
|
||||
revision: 8c938dddd22f16e2e15471a648aaa96be380c562
|
||||
branch: 3-2-stable
|
||||
PATH
|
||||
remote: .
|
||||
specs:
|
||||
simple_form (2.1.0.dev)
|
||||
actionpack (~> 3.0)
|
||||
activemodel (~> 3.0)
|
||||
|
||||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
actionpack (3.2.9)
|
||||
activemodel (= 3.2.9)
|
||||
|
@ -19,24 +24,6 @@ GIT
|
|||
activesupport (3.2.9)
|
||||
i18n (~> 0.6)
|
||||
multi_json (~> 1.0)
|
||||
railties (3.2.9)
|
||||
actionpack (= 3.2.9)
|
||||
activesupport (= 3.2.9)
|
||||
rack-ssl (~> 1.3.2)
|
||||
rake (>= 0.8.7)
|
||||
rdoc (~> 3.4)
|
||||
thor (>= 0.14.6, < 2.0)
|
||||
|
||||
PATH
|
||||
remote: .
|
||||
specs:
|
||||
simple_form (2.1.0.dev)
|
||||
actionpack (~> 3.0)
|
||||
activemodel (~> 3.0)
|
||||
|
||||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
builder (3.0.4)
|
||||
country_select (1.0.1)
|
||||
erubis (2.7.0)
|
||||
|
@ -45,9 +32,9 @@ GEM
|
|||
journey (1.0.4)
|
||||
json (1.7.5)
|
||||
metaclass (0.0.1)
|
||||
mocha (0.13.0)
|
||||
mocha (0.12.7)
|
||||
metaclass (~> 0.0.1)
|
||||
multi_json (1.3.7)
|
||||
multi_json (1.5.0)
|
||||
rack (1.4.1)
|
||||
rack-cache (1.2)
|
||||
rack (>= 0.4)
|
||||
|
@ -55,10 +42,17 @@ GEM
|
|||
rack
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
railties (3.2.9)
|
||||
actionpack (= 3.2.9)
|
||||
activesupport (= 3.2.9)
|
||||
rack-ssl (~> 1.3.2)
|
||||
rake (>= 0.8.7)
|
||||
rdoc (~> 3.4)
|
||||
thor (>= 0.14.6, < 2.0)
|
||||
rake (10.0.1)
|
||||
rdoc (3.12)
|
||||
json (~> 1.4)
|
||||
sprockets (2.2.1)
|
||||
sprockets (2.2.2)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
|
@ -71,11 +65,11 @@ PLATFORMS
|
|||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
actionpack (~> 3.2.0)!
|
||||
activemodel (~> 3.2.0)!
|
||||
actionpack (~> 3.2.0)
|
||||
activemodel (~> 3.2.0)
|
||||
country_select
|
||||
mocha
|
||||
railties (~> 3.2.0)!
|
||||
mocha (~> 0.12.0)
|
||||
railties (~> 3.2.0)
|
||||
rake
|
||||
rdoc
|
||||
simple_form!
|
||||
|
|
|
@ -2,7 +2,7 @@ require 'rubygems'
|
|||
require 'bundler/setup'
|
||||
|
||||
require 'test/unit'
|
||||
require 'mocha/setup'
|
||||
require 'mocha'
|
||||
|
||||
require 'active_model'
|
||||
require 'action_controller'
|
||||
|
|
Loading…
Reference in New Issue