kotovalexarian-likes-github/thoughtbot--shoulda-matchers
1
0
Fork 0
mirror of https://github.com/thoughtbot/shoulda-matchers.git synced 2022-11-09 12:01:38 -05:00
Code Releases Activity

Upgrade 4.1 appraisal to Rails 4.1.7

Browse source 
This version fixes a bug with habtm and a namespaced class name so that
when the association looks up that class it will look inside the model
namespace instead of the global namespace.
This commit is contained in:
Elliot Winkler 2014-11-06 13:35:41 -07:00
parent 1a5bbfa34c
commit 2162965445
2 changed files with 36 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
gemfiles/4.1.gemfile.lock
View file

@ -7,31 +7,31 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.0)
actionpack (= 4.1.0)
actionview (= 4.1.0)
mail (~> 2.5.4)
actionpack (4.1.0)
actionview (= 4.1.0)
activesupport (= 4.1.0)
actionmailer (4.1.7)
actionpack (= 4.1.7)
actionview (= 4.1.7)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.7)
actionview (= 4.1.7)
activesupport (= 4.1.7)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.0)
activesupport (= 4.1.0)
actionview (4.1.7)
activesupport (= 4.1.7)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.0)
activesupport (= 4.1.0)
activemodel (4.1.7)
activesupport (= 4.1.7)
builder (~> 3.1)
activerecord (4.1.0)
activemodel (= 4.1.0)
activesupport (= 4.1.0)
activerecord (4.1.7)
activemodel (= 4.1.7)
activesupport (= 4.1.7)
arel (~> 5.0.0)
activeresource (4.0.0)
activemodel (~> 4.0)
activesupport (~> 4.0)
rails-observers (~> 0.1.1)
activesupport (4.1.0)
activesupport (4.1.7)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@ -42,7 +42,7 @@ GEM
bundler
rake
thor (>= 0.14.0)
arel (5.0.0)
arel (5.0.1.20140414130214)
aruba (0.6.0)
childprocess (>= 0.3.6)
cucumber (>= 1.1.1)
@ -82,12 +82,11 @@ GEM
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mail (2.6.3)
mime-types (>= 1.16, < 3)
metaclass (0.0.2)
method_source (0.8.2)
mime-types (1.25.1)
mime-types (2.4.3)
minitest (5.4.2)
minitest-reporters (1.0.5)
ansi
@ -98,7 +97,6 @@ GEM
metaclass (~> 0.0.1)
multi_json (1.10.1)
multi_test (0.1.1)
polyglot (0.3.4)
posix-spawn (0.3.8)
protected_attributes (1.0.7)
activemodel (>= 4.0.1, < 5.0)
@ -112,21 +110,21 @@ GEM
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.1.0)
actionmailer (= 4.1.0)
actionpack (= 4.1.0)
actionview (= 4.1.0)
activemodel (= 4.1.0)
activerecord (= 4.1.0)
activesupport (= 4.1.0)
rails (4.1.7)
actionmailer (= 4.1.7)
actionpack (= 4.1.7)
actionview (= 4.1.7)
activemodel (= 4.1.7)
activerecord (= 4.1.7)
activesupport (= 4.1.7)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.0)
railties (= 4.1.7)
sprockets-rails (~> 2.0)
rails-observers (0.1.2)
activemodel (~> 4.0)
railties (4.1.0)
actionpack (= 4.1.0)
activesupport (= 4.1.0)
railties (4.1.7)
actionpack (= 4.1.7)
activesupport (= 4.1.7)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
@ -169,17 +167,14 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.1.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (~> 2.8)
sprockets-rails (2.2.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.9)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turbolinks (2.2.2)
coffee-rails
tzinfo (1.2.2)

4
spec/unit/shoulda/matchers/active_record/association_matcher_spec.rb
View file

@ -1098,7 +1098,7 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
args = []
options = {}
if Shoulda::Matchers::RailsShim.active_record_major_version == 4
args << lambda { where(conditions) }
args << proc { where(conditions) }
else
options[:conditions] = conditions
end
@ -1110,7 +1110,7 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
args = []
options = {}
if Shoulda::Matchers::RailsShim.active_record_major_version == 4
args << lambda { order(order) }
args << proc { order(order) }
else
options[:order] = order
end