Test against RSpec 3 from now on
* Ruby 2.2 removed Minitest and Test::Unit from the standard library [[1]], [[2]] * rspec-rails requires Test::Unit for Rails versions prior to 4.1 (which switched to Minitest) * This doesn't work now, because we don't have Test::Unit present in the gem bundle * RSpec 3.2.0 fixes this issue [[3]] I don't really see this as a huge concern, since we were testing against RSpec 2.99 for Rails < 4, and that has most of the changes that RSpec 3 has. [1]:f8c6a5dc02[2]:96f552670d[3]:999ebb7c5c (diff-08d960c572ac094640dd183fa9641393R13)
This commit is contained in:
Elliot Winkler
parent
dff472e53a
commit
b7fe87ae91
|
|
@ -7,7 +7,6 @@ end
|
|||
|
||||
rails_3 = proc do
|
||||
gem 'strong_parameters'
|
||||
gem 'rspec-rails', '2.99.0'
|
||||
gem 'minitest', '~> 4.0'
|
||||
gem 'minitest-reporters'
|
||||
end
|
||||
|
|
@ -20,7 +19,6 @@ rails_3_1 = proc do
|
|||
gem 'sass-rails', '~> 3.1.5'
|
||||
gem 'coffee-rails', '~> 3.1.1'
|
||||
gem 'uglifier', '>= 1.0.3'
|
||||
gem 'rspec-rails', '2.99.0'
|
||||
gem 'minitest', '~> 4.0'
|
||||
gem 'minitest-reporters'
|
||||
end
|
||||
|
|
@ -45,7 +43,6 @@ rails_4 = proc do
|
|||
gem 'turbolinks'
|
||||
gem 'sdoc'
|
||||
gem 'activeresource', '4.0.0'
|
||||
gem 'rspec-rails', '~> 3.0.1'
|
||||
# Test suite makes heavy use of attr_accessible
|
||||
gem 'protected_attributes'
|
||||
gem 'minitest-reporters'
|
||||
|
|
@ -98,7 +95,6 @@ if Gem::Requirement.new('> 1.9.2').satisfied_by?(ruby_version)
|
|||
gem 'jbuilder', '~> 1.2'
|
||||
gem 'sass-rails', '~> 4.0.0'
|
||||
gem 'bcrypt-ruby', '~> 3.1.2'
|
||||
gem 'rspec-rails', '2.99.0'
|
||||
end
|
||||
|
||||
appraise '4.1' do
|
||||
|
|
|
|||
2
Gemfile
2
Gemfile
|
|
@ -7,7 +7,7 @@ gem 'bundler', '~> 1.1'
|
|||
gem 'pry-nav'
|
||||
gem 'rails', '~> 3.0'
|
||||
gem 'rake', '>= 0.9.2'
|
||||
gem 'rspec-rails', '>= 2.99.0'
|
||||
gem 'rspec-rails', '~> 3.0'
|
||||
|
||||
# YARD
|
||||
gem 'yard'
|
||||
|
|
|
|||
43
Gemfile.lock
43
Gemfile.lock
|
|
@ -55,9 +55,9 @@ GEM
|
|||
gherkin (2.12.2)
|
||||
multi_json (~> 1.3)
|
||||
hike (1.2.3)
|
||||
i18n (0.6.11)
|
||||
i18n (0.7.0)
|
||||
journey (1.0.4)
|
||||
json (1.8.1)
|
||||
json (1.8.2)
|
||||
mail (2.5.4)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
|
|
@ -84,7 +84,7 @@ GEM
|
|||
rack (>= 0.4)
|
||||
rack-ssl (1.3.4)
|
||||
rack
|
||||
rack-test (0.6.2)
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (3.2.16)
|
||||
actionmailer (= 3.2.16)
|
||||
|
|
@ -101,29 +101,30 @@ GEM
|
|||
rake (>= 0.8.7)
|
||||
rdoc (~> 3.4)
|
||||
thor (>= 0.14.6, < 2.0)
|
||||
rake (10.3.2)
|
||||
rake (10.4.2)
|
||||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
redcarpet (3.0.0)
|
||||
rspec-core (3.0.3)
|
||||
rspec-support (~> 3.0.0)
|
||||
rspec-expectations (3.0.3)
|
||||
rspec-core (3.2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-expectations (3.2.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.0.0)
|
||||
rspec-mocks (3.0.3)
|
||||
rspec-support (~> 3.0.0)
|
||||
rspec-rails (3.0.2)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
rspec-core (~> 3.0.0)
|
||||
rspec-expectations (~> 3.0.0)
|
||||
rspec-mocks (~> 3.0.0)
|
||||
rspec-support (~> 3.0.0)
|
||||
rspec-support (3.0.3)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-mocks (3.2.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-rails (3.2.0)
|
||||
actionpack (>= 3.0, <= 4.2)
|
||||
activesupport (>= 3.0, <= 4.2)
|
||||
railties (>= 3.0, <= 4.2)
|
||||
rspec-core (~> 3.2.0)
|
||||
rspec-expectations (~> 3.2.0)
|
||||
rspec-mocks (~> 3.2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-support (3.2.1)
|
||||
shoulda-context (1.2.0)
|
||||
slop (3.6.0)
|
||||
sprockets (2.2.2)
|
||||
sprockets (2.2.3)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
|
|
@ -156,7 +157,7 @@ DEPENDENCIES
|
|||
rails (~> 3.0)
|
||||
rake (>= 0.9.2)
|
||||
redcarpet
|
||||
rspec-rails (>= 2.99.0)
|
||||
rspec-rails (~> 3.0)
|
||||
shoulda-context (~> 1.2.0)
|
||||
sqlite3
|
||||
therubyrhino
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ gem "bundler", "~> 1.1"
|
|||
gem "pry-nav"
|
||||
gem "rails", "~> 3.0.17"
|
||||
gem "rake", ">= 0.9.2"
|
||||
gem "rspec-rails", "2.99.0"
|
||||
gem "rspec-rails", "~> 3.0"
|
||||
gem "yard"
|
||||
gem "redcarpet"
|
||||
gem "pygments.rb"
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ GEM
|
|||
multi_json (~> 1.3)
|
||||
hashie (3.3.1)
|
||||
i18n (0.5.4)
|
||||
json (1.8.1)
|
||||
json (1.8.2)
|
||||
mail (2.2.19)
|
||||
activesupport (>= 2.3.6)
|
||||
i18n (>= 0.4.0)
|
||||
|
|
@ -110,25 +110,27 @@ GEM
|
|||
rake (>= 0.8.7)
|
||||
rdoc (~> 3.4)
|
||||
thor (~> 0.14.4)
|
||||
rake (10.3.2)
|
||||
rake (10.4.2)
|
||||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
redcarpet (3.1.2)
|
||||
rspec-collection_matchers (1.0.0)
|
||||
rspec-expectations (>= 2.99.0.beta1)
|
||||
rspec-core (2.99.1)
|
||||
rspec-expectations (2.99.2)
|
||||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
rspec-mocks (2.99.2)
|
||||
rspec-rails (2.99.0)
|
||||
actionpack (>= 3.0)
|
||||
activemodel (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
rspec-collection_matchers
|
||||
rspec-core (~> 2.99.0)
|
||||
rspec-expectations (~> 2.99.0)
|
||||
rspec-mocks (~> 2.99.0)
|
||||
rspec-core (3.2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-expectations (3.2.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-mocks (3.2.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-rails (3.2.0)
|
||||
actionpack (>= 3.0, <= 4.2)
|
||||
activesupport (>= 3.0, <= 4.2)
|
||||
railties (>= 3.0, <= 4.2)
|
||||
rspec-core (~> 3.2.0)
|
||||
rspec-expectations (~> 3.2.0)
|
||||
rspec-mocks (~> 3.2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-support (3.2.1)
|
||||
shoulda-context (1.2.0)
|
||||
slop (3.6.0)
|
||||
sqlite3 (1.3.7)
|
||||
|
|
@ -140,7 +142,7 @@ GEM
|
|||
treetop (1.4.12)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
tzinfo (0.3.41)
|
||||
tzinfo (0.3.43)
|
||||
watchr (0.7)
|
||||
yajl-ruby (1.1.0)
|
||||
yard (0.8.7.3)
|
||||
|
|
@ -164,7 +166,7 @@ DEPENDENCIES
|
|||
rails (~> 3.0.17)
|
||||
rake (>= 0.9.2)
|
||||
redcarpet
|
||||
rspec-rails (= 2.99.0)
|
||||
rspec-rails (~> 3.0)
|
||||
shoulda-context (~> 1.2.0)
|
||||
sqlite3
|
||||
strong_parameters
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ gem "bundler", "~> 1.1"
|
|||
gem "pry-nav"
|
||||
gem "rails", "~> 3.1.8"
|
||||
gem "rake", ">= 0.9.2"
|
||||
gem "rspec-rails", "2.99.0"
|
||||
gem "rspec-rails", "~> 3.0"
|
||||
gem "yard"
|
||||
gem "redcarpet"
|
||||
gem "pygments.rb"
|
||||
|
|
|
|||
|
|
@ -67,11 +67,11 @@ GEM
|
|||
multi_json (~> 1.3)
|
||||
hashie (3.3.1)
|
||||
hike (1.2.3)
|
||||
i18n (0.6.11)
|
||||
i18n (0.7.0)
|
||||
jquery-rails (2.2.1)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (1.8.1)
|
||||
json (1.8.2)
|
||||
mail (2.3.3)
|
||||
i18n (>= 0.4.0)
|
||||
mime-types (~> 1.16)
|
||||
|
|
@ -110,7 +110,7 @@ GEM
|
|||
rack (>= 1.0.0)
|
||||
rack-ssl (1.3.4)
|
||||
rack
|
||||
rack-test (0.6.2)
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (3.1.11)
|
||||
actionmailer (= 3.1.11)
|
||||
|
|
@ -127,25 +127,27 @@ GEM
|
|||
rake (>= 0.8.7)
|
||||
rdoc (~> 3.4)
|
||||
thor (~> 0.14.6)
|
||||
rake (10.3.2)
|
||||
rake (10.4.2)
|
||||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
redcarpet (3.1.2)
|
||||
rspec-collection_matchers (1.0.0)
|
||||
rspec-expectations (>= 2.99.0.beta1)
|
||||
rspec-core (2.99.1)
|
||||
rspec-expectations (2.99.2)
|
||||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
rspec-mocks (2.99.2)
|
||||
rspec-rails (2.99.0)
|
||||
actionpack (>= 3.0)
|
||||
activemodel (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
rspec-collection_matchers
|
||||
rspec-core (~> 2.99.0)
|
||||
rspec-expectations (~> 2.99.0)
|
||||
rspec-mocks (~> 2.99.0)
|
||||
rspec-core (3.2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-expectations (3.2.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-mocks (3.2.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-rails (3.2.0)
|
||||
actionpack (>= 3.0, <= 4.2)
|
||||
activesupport (>= 3.0, <= 4.2)
|
||||
railties (>= 3.0, <= 4.2)
|
||||
rspec-core (~> 3.2.0)
|
||||
rspec-expectations (~> 3.2.0)
|
||||
rspec-mocks (~> 3.2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-support (3.2.1)
|
||||
sass (3.2.7)
|
||||
sass-rails (3.1.6)
|
||||
actionpack (~> 3.1.0)
|
||||
|
|
@ -154,7 +156,7 @@ GEM
|
|||
tilt (~> 1.3.2)
|
||||
shoulda-context (1.2.0)
|
||||
slop (3.6.0)
|
||||
sprockets (2.0.4)
|
||||
sprockets (2.0.5)
|
||||
hike (~> 1.2)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
|
|
@ -200,7 +202,7 @@ DEPENDENCIES
|
|||
rails (~> 3.1.8)
|
||||
rake (>= 0.9.2)
|
||||
redcarpet
|
||||
rspec-rails (= 2.99.0)
|
||||
rspec-rails (~> 3.0)
|
||||
sass-rails (~> 3.1.5)
|
||||
shoulda-context (~> 1.2.0)
|
||||
sqlite3
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ gem "bundler", "~> 1.1"
|
|||
gem "pry-nav"
|
||||
gem "rails", "~> 3.2.13"
|
||||
gem "rake", ">= 0.9.2"
|
||||
gem "rspec-rails", "2.99.0"
|
||||
gem "rspec-rails", "~> 3.0"
|
||||
gem "yard"
|
||||
gem "redcarpet"
|
||||
gem "pygments.rb"
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ GEM
|
|||
jquery-rails (2.2.1)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (1.8.1)
|
||||
json (1.8.2)
|
||||
mail (2.5.3)
|
||||
i18n (>= 0.4.0)
|
||||
mime-types (~> 1.16)
|
||||
|
|
@ -108,7 +108,7 @@ GEM
|
|||
rack (>= 0.4)
|
||||
rack-ssl (1.3.4)
|
||||
rack
|
||||
rack-test (0.6.2)
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (3.2.13)
|
||||
actionmailer (= 3.2.13)
|
||||
|
|
@ -125,25 +125,27 @@ GEM
|
|||
rake (>= 0.8.7)
|
||||
rdoc (~> 3.4)
|
||||
thor (>= 0.14.6, < 2.0)
|
||||
rake (10.3.2)
|
||||
rake (10.4.2)
|
||||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
redcarpet (3.1.2)
|
||||
rspec-collection_matchers (1.0.0)
|
||||
rspec-expectations (>= 2.99.0.beta1)
|
||||
rspec-core (2.99.1)
|
||||
rspec-expectations (2.99.2)
|
||||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
rspec-mocks (2.99.2)
|
||||
rspec-rails (2.99.0)
|
||||
actionpack (>= 3.0)
|
||||
activemodel (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
rspec-collection_matchers
|
||||
rspec-core (~> 2.99.0)
|
||||
rspec-expectations (~> 2.99.0)
|
||||
rspec-mocks (~> 2.99.0)
|
||||
rspec-core (3.2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-expectations (3.2.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-mocks (3.2.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-rails (3.2.0)
|
||||
actionpack (>= 3.0, <= 4.2)
|
||||
activesupport (>= 3.0, <= 4.2)
|
||||
railties (>= 3.0, <= 4.2)
|
||||
rspec-core (~> 3.2.0)
|
||||
rspec-expectations (~> 3.2.0)
|
||||
rspec-mocks (~> 3.2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-support (3.2.1)
|
||||
sass (3.2.7)
|
||||
sass-rails (3.2.6)
|
||||
railties (~> 3.2.0)
|
||||
|
|
@ -154,7 +156,7 @@ GEM
|
|||
spring (1.1.3)
|
||||
spring-commands-rspec (1.0.2)
|
||||
spring (>= 0.9.1)
|
||||
sprockets (2.2.2)
|
||||
sprockets (2.2.3)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
|
|
@ -199,7 +201,7 @@ DEPENDENCIES
|
|||
rails (~> 3.2.13)
|
||||
rake (>= 0.9.2)
|
||||
redcarpet
|
||||
rspec-rails (= 2.99.0)
|
||||
rspec-rails (~> 3.0)
|
||||
sass-rails (~> 3.2.3)
|
||||
shoulda-context (~> 1.2.0)
|
||||
spring
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ gem "bundler", "~> 1.1"
|
|||
gem "pry-nav"
|
||||
gem "rails", "4.0.0"
|
||||
gem "rake", ">= 0.9.2"
|
||||
gem "rspec-rails", "~> 3.0.1"
|
||||
gem "rspec-rails", "~> 3.0"
|
||||
gem "yard"
|
||||
gem "redcarpet"
|
||||
gem "pygments.rb"
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ GEM
|
|||
multi_json (~> 1.3)
|
||||
hashie (3.3.1)
|
||||
hike (1.2.3)
|
||||
i18n (0.6.11)
|
||||
i18n (0.7.0)
|
||||
jbuilder (1.5.3)
|
||||
activesupport (>= 3.0.0)
|
||||
multi_json (>= 1.2.0)
|
||||
|
|
@ -108,7 +108,7 @@ GEM
|
|||
posix-spawn (~> 0.3.6)
|
||||
yajl-ruby (~> 1.1.0)
|
||||
rack (1.5.2)
|
||||
rack-test (0.6.2)
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (4.0.0)
|
||||
actionmailer (= 4.0.0)
|
||||
|
|
@ -125,26 +125,27 @@ GEM
|
|||
activesupport (= 4.0.0)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.3.2)
|
||||
rake (10.4.2)
|
||||
rdoc (4.1.1)
|
||||
json (~> 1.4)
|
||||
redcarpet (3.1.2)
|
||||
rspec-core (3.0.3)
|
||||
rspec-support (~> 3.0.0)
|
||||
rspec-expectations (3.0.3)
|
||||
rspec-core (3.2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-expectations (3.2.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.0.0)
|
||||
rspec-mocks (3.0.3)
|
||||
rspec-support (~> 3.0.0)
|
||||
rspec-rails (3.0.2)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
rspec-core (~> 3.0.0)
|
||||
rspec-expectations (~> 3.0.0)
|
||||
rspec-mocks (~> 3.0.0)
|
||||
rspec-support (~> 3.0.0)
|
||||
rspec-support (3.0.3)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-mocks (3.2.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-rails (3.2.0)
|
||||
actionpack (>= 3.0, <= 4.2)
|
||||
activesupport (>= 3.0, <= 4.2)
|
||||
railties (>= 3.0, <= 4.2)
|
||||
rspec-core (~> 3.2.0)
|
||||
rspec-expectations (~> 3.2.0)
|
||||
rspec-mocks (~> 3.2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-support (3.2.1)
|
||||
sass (3.2.19)
|
||||
sass-rails (4.0.3)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
|
|
@ -177,7 +178,7 @@ GEM
|
|||
polyglot (>= 0.3.1)
|
||||
turbolinks (2.2.2)
|
||||
coffee-rails
|
||||
tzinfo (0.3.41)
|
||||
tzinfo (0.3.43)
|
||||
uglifier (2.5.0)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
|
|
@ -209,7 +210,7 @@ DEPENDENCIES
|
|||
rails (= 4.0.0)
|
||||
rake (>= 0.9.2)
|
||||
redcarpet
|
||||
rspec-rails (~> 3.0.1)
|
||||
rspec-rails (~> 3.0)
|
||||
sass-rails (~> 4.0.0)
|
||||
sdoc
|
||||
shoulda-context (~> 1.2.0)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ gem "bundler", "~> 1.1"
|
|||
gem "pry-nav"
|
||||
gem "rails", "4.0.1"
|
||||
gem "rake", ">= 0.9.2"
|
||||
gem "rspec-rails", "2.99.0"
|
||||
gem "rspec-rails", "~> 3.0"
|
||||
gem "yard"
|
||||
gem "redcarpet"
|
||||
gem "pygments.rb"
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ GEM
|
|||
multi_json (~> 1.3)
|
||||
hashie (3.3.1)
|
||||
hike (1.2.3)
|
||||
i18n (0.6.11)
|
||||
i18n (0.7.0)
|
||||
jbuilder (1.5.3)
|
||||
activesupport (>= 3.0.0)
|
||||
multi_json (>= 1.2.0)
|
||||
|
|
@ -108,7 +108,7 @@ GEM
|
|||
posix-spawn (~> 0.3.6)
|
||||
yajl-ruby (~> 1.1.0)
|
||||
rack (1.5.2)
|
||||
rack-test (0.6.2)
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (4.0.1)
|
||||
actionmailer (= 4.0.1)
|
||||
|
|
@ -125,25 +125,27 @@ GEM
|
|||
activesupport (= 4.0.1)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.3.2)
|
||||
rake (10.4.2)
|
||||
rdoc (4.1.1)
|
||||
json (~> 1.4)
|
||||
redcarpet (3.1.2)
|
||||
rspec-collection_matchers (1.0.0)
|
||||
rspec-expectations (>= 2.99.0.beta1)
|
||||
rspec-core (2.99.1)
|
||||
rspec-expectations (2.99.2)
|
||||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
rspec-mocks (2.99.2)
|
||||
rspec-rails (2.99.0)
|
||||
actionpack (>= 3.0)
|
||||
activemodel (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
rspec-collection_matchers
|
||||
rspec-core (~> 2.99.0)
|
||||
rspec-expectations (~> 2.99.0)
|
||||
rspec-mocks (~> 2.99.0)
|
||||
rspec-core (3.2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-expectations (3.2.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-mocks (3.2.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-rails (3.2.0)
|
||||
actionpack (>= 3.0, <= 4.2)
|
||||
activesupport (>= 3.0, <= 4.2)
|
||||
railties (>= 3.0, <= 4.2)
|
||||
rspec-core (~> 3.2.0)
|
||||
rspec-expectations (~> 3.2.0)
|
||||
rspec-mocks (~> 3.2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-support (3.2.1)
|
||||
sass (3.2.12)
|
||||
sass-rails (4.0.1)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
|
|
@ -175,7 +177,7 @@ GEM
|
|||
polyglot (>= 0.3.1)
|
||||
turbolinks (2.2.2)
|
||||
coffee-rails
|
||||
tzinfo (0.3.41)
|
||||
tzinfo (0.3.43)
|
||||
uglifier (2.5.0)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
|
|
@ -207,7 +209,7 @@ DEPENDENCIES
|
|||
rails (= 4.0.1)
|
||||
rake (>= 0.9.2)
|
||||
redcarpet
|
||||
rspec-rails (= 2.99.0)
|
||||
rspec-rails (~> 3.0)
|
||||
sass-rails (~> 4.0.0)
|
||||
sdoc
|
||||
shoulda-context (~> 1.2.0)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ gem "bundler", "~> 1.1"
|
|||
gem "pry-nav"
|
||||
gem "rails", "~> 4.1.0"
|
||||
gem "rake", ">= 0.9.2"
|
||||
gem "rspec-rails", "~> 3.0.1"
|
||||
gem "rspec-rails", "~> 3.0"
|
||||
gem "yard"
|
||||
gem "redcarpet"
|
||||
gem "pygments.rb"
|
||||
|
|
|
|||
|
|
@ -68,20 +68,20 @@ GEM
|
|||
gherkin (2.12.2)
|
||||
multi_json (~> 1.3)
|
||||
hike (1.2.3)
|
||||
i18n (0.6.11)
|
||||
i18n (0.7.0)
|
||||
jbuilder (2.0.6)
|
||||
activesupport (>= 3.0.0, < 5)
|
||||
multi_json (~> 1.2)
|
||||
jquery-rails (3.1.0)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (1.8.1)
|
||||
json (1.8.2)
|
||||
mail (2.6.3)
|
||||
mime-types (>= 1.16, < 3)
|
||||
metaclass (0.0.2)
|
||||
method_source (0.8.2)
|
||||
mime-types (2.4.3)
|
||||
minitest (5.4.2)
|
||||
minitest (5.5.1)
|
||||
minitest-reporters (1.0.5)
|
||||
ansi
|
||||
builder
|
||||
|
|
@ -104,7 +104,7 @@ GEM
|
|||
posix-spawn (~> 0.3.6)
|
||||
yajl-ruby (~> 1.1.0)
|
||||
rack (1.5.2)
|
||||
rack-test (0.6.2)
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (4.1.7)
|
||||
actionmailer (= 4.1.7)
|
||||
|
|
@ -123,26 +123,27 @@ GEM
|
|||
activesupport (= 4.1.7)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.3.2)
|
||||
rake (10.4.2)
|
||||
rdoc (4.1.1)
|
||||
json (~> 1.4)
|
||||
redcarpet (3.1.2)
|
||||
rspec-core (3.0.3)
|
||||
rspec-support (~> 3.0.0)
|
||||
rspec-expectations (3.0.3)
|
||||
rspec-core (3.2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-expectations (3.2.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.0.0)
|
||||
rspec-mocks (3.0.3)
|
||||
rspec-support (~> 3.0.0)
|
||||
rspec-rails (3.0.2)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
rspec-core (~> 3.0.0)
|
||||
rspec-expectations (~> 3.0.0)
|
||||
rspec-mocks (~> 3.0.0)
|
||||
rspec-support (~> 3.0.0)
|
||||
rspec-support (3.0.3)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-mocks (3.2.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-rails (3.2.0)
|
||||
actionpack (>= 3.0, <= 4.2)
|
||||
activesupport (>= 3.0, <= 4.2)
|
||||
railties (>= 3.0, <= 4.2)
|
||||
rspec-core (~> 3.2.0)
|
||||
rspec-expectations (~> 3.2.0)
|
||||
rspec-mocks (~> 3.2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-support (3.2.1)
|
||||
ruby-progressbar (1.5.1)
|
||||
sass (3.2.19)
|
||||
sass-rails (4.0.3)
|
||||
|
|
@ -206,7 +207,7 @@ DEPENDENCIES
|
|||
rails (~> 4.1.0)
|
||||
rake (>= 0.9.2)
|
||||
redcarpet
|
||||
rspec-rails (~> 3.0.1)
|
||||
rspec-rails (~> 3.0)
|
||||
sass-rails (~> 4.0.3)
|
||||
sdoc (~> 0.4.0)
|
||||
shoulda-context (~> 1.2.0)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ gem "bundler", "~> 1.1"
|
|||
gem "pry-nav"
|
||||
gem "rails", "~> 4.2.0"
|
||||
gem "rake", ">= 0.9.2"
|
||||
gem "rspec-rails", "~> 3.0.1"
|
||||
gem "rspec-rails", "~> 3.0"
|
||||
gem "yard"
|
||||
gem "redcarpet"
|
||||
gem "pygments.rb"
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ GEM
|
|||
metaclass (~> 0.0.1)
|
||||
multi_json (1.10.1)
|
||||
multi_test (0.1.1)
|
||||
nokogiri (1.6.6.1)
|
||||
nokogiri (1.6.6.2)
|
||||
mini_portile (~> 0.6.0)
|
||||
posix-spawn (0.3.9)
|
||||
protected_attributes (1.0.8)
|
||||
|
|
@ -153,22 +153,23 @@ GEM
|
|||
rdoc (4.2.0)
|
||||
json (~> 1.4)
|
||||
redcarpet (3.2.2)
|
||||
rspec-core (3.0.4)
|
||||
rspec-support (~> 3.0.0)
|
||||
rspec-expectations (3.0.4)
|
||||
rspec-core (3.2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-expectations (3.2.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.0.0)
|
||||
rspec-mocks (3.0.4)
|
||||
rspec-support (~> 3.0.0)
|
||||
rspec-rails (3.0.2)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
rspec-core (~> 3.0.0)
|
||||
rspec-expectations (~> 3.0.0)
|
||||
rspec-mocks (~> 3.0.0)
|
||||
rspec-support (~> 3.0.0)
|
||||
rspec-support (3.0.4)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-mocks (3.2.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-rails (3.2.0)
|
||||
actionpack (>= 3.0, <= 4.2)
|
||||
activesupport (>= 3.0, <= 4.2)
|
||||
railties (>= 3.0, <= 4.2)
|
||||
rspec-core (~> 3.2.0)
|
||||
rspec-expectations (~> 3.2.0)
|
||||
rspec-mocks (~> 3.2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-support (3.2.1)
|
||||
ruby-progressbar (1.7.1)
|
||||
sass (3.4.9)
|
||||
sass-rails (5.0.0)
|
||||
|
|
@ -233,7 +234,7 @@ DEPENDENCIES
|
|||
rails (~> 4.2.0)
|
||||
rake (>= 0.9.2)
|
||||
redcarpet
|
||||
rspec-rails (~> 3.0.1)
|
||||
rspec-rails (~> 3.0)
|
||||
sass-rails (~> 5.0)
|
||||
sdoc (~> 0.4.0)
|
||||
shoulda-context (~> 1.2.0)
|
||||
|
|
|
|||
Loading…
Reference in New Issue