shoulda-matchers 1.5.0 → 1.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (17) hide show
  1. data/.travis.yml +1 -0
  2. data/Gemfile.lock +28 -25
  3. data/NEWS.md +4 -0
  4. data/README.md +1 -1
  5. data/features/step_definitions/rails_steps.rb +5 -4
  6. data/gemfiles/3.0.gemfile +1 -1
  7. data/gemfiles/3.0.gemfile.lock +60 -56
  8. data/gemfiles/3.1.gemfile +1 -1
  9. data/gemfiles/3.1.gemfile.lock +66 -63
  10. data/gemfiles/3.2.gemfile +1 -1
  11. data/gemfiles/3.2.gemfile.lock +69 -66
  12. data/lib/shoulda/matchers/integrations/rspec.rb +1 -1
  13. data/lib/shoulda/matchers/version.rb +1 -1
  14. data/shoulda-matchers.gemspec +3 -2
  15. data/spec/shoulda/matchers/active_record/association_matcher_spec.rb +5 -1
  16. data/spec/support/model_builder.rb +1 -0
  17. metadata +24 -8
data/.travis.yml CHANGED
@@ -14,6 +14,7 @@ gemfile:
14
14
 
15
15
  matrix:
16
16
  allow_failures:
17
+ - rvm: 1.8.7
17
18
  - rvm: rbx-18mode
18
19
  - rvm: jruby
19
20
  exclude:
data/Gemfile.lock CHANGED
@@ -1,9 +1,9 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- shoulda-matchers (1.5.0)
4
+ shoulda-matchers (1.5.1)
5
5
  activesupport (>= 3.0.0)
6
- bourne (~> 1.2.0)
6
+ bourne (~> 1.3)
7
7
 
8
8
  GEM
9
9
  remote: https://rubygems.org/
@@ -43,8 +43,8 @@ GEM
43
43
  childprocess (~> 0.3.6)
44
44
  cucumber (>= 1.1.1)
45
45
  rspec-expectations (>= 2.7.0)
46
- bourne (1.2.1)
47
- mocha (= 0.12.7)
46
+ bourne (1.4.0)
47
+ mocha (~> 0.13.2)
48
48
  builder (3.0.4)
49
49
  childprocess (0.3.6)
50
50
  ffi (~> 1.0, >= 1.0.6)
@@ -53,29 +53,29 @@ GEM
53
53
  diff-lcs (>= 1.1.3)
54
54
  gherkin (~> 2.11.0)
55
55
  json (>= 1.4.6)
56
- diff-lcs (1.1.3)
56
+ diff-lcs (1.2.1)
57
57
  erubis (2.7.0)
58
58
  ffi (1.2.0)
59
59
  gherkin (2.11.5)
60
60
  json (>= 1.4.6)
61
61
  hike (1.2.1)
62
- i18n (0.6.1)
62
+ i18n (0.6.4)
63
63
  journey (1.0.4)
64
- json (1.7.6)
64
+ json (1.7.7)
65
65
  mail (2.4.4)
66
66
  i18n (>= 0.4.0)
67
67
  mime-types (~> 1.16)
68
68
  treetop (~> 1.4.8)
69
69
  metaclass (0.0.1)
70
70
  mime-types (1.19)
71
- mocha (0.12.7)
71
+ mocha (0.13.3)
72
72
  metaclass (~> 0.0.1)
73
- multi_json (1.5.0)
73
+ multi_json (1.7.1)
74
74
  polyglot (0.3.3)
75
- rack (1.4.4)
75
+ rack (1.4.5)
76
76
  rack-cache (1.2)
77
77
  rack (>= 0.4)
78
- rack-ssl (1.3.2)
78
+ rack-ssl (1.3.3)
79
79
  rack
80
80
  rack-test (0.6.2)
81
81
  rack (>= 1.0)
@@ -95,21 +95,23 @@ GEM
95
95
  rdoc (~> 3.4)
96
96
  thor (>= 0.14.6, < 2.0)
97
97
  rake (10.0.3)
98
- rdoc (3.12)
98
+ rdoc (3.12.2)
99
99
  json (~> 1.4)
100
- rspec (2.8.0)
101
- rspec-core (~> 2.8.0)
102
- rspec-expectations (~> 2.8.0)
103
- rspec-mocks (~> 2.8.0)
104
- rspec-core (2.8.0)
105
- rspec-expectations (2.8.0)
106
- diff-lcs (~> 1.1.2)
107
- rspec-mocks (2.8.0)
108
- rspec-rails (2.8.1)
100
+ rspec (2.13.0)
101
+ rspec-core (~> 2.13.0)
102
+ rspec-expectations (~> 2.13.0)
103
+ rspec-mocks (~> 2.13.0)
104
+ rspec-core (2.13.1)
105
+ rspec-expectations (2.13.0)
106
+ diff-lcs (>= 1.1.3, < 2.0)
107
+ rspec-mocks (2.13.0)
108
+ rspec-rails (2.13.0)
109
109
  actionpack (>= 3.0)
110
110
  activesupport (>= 3.0)
111
111
  railties (>= 3.0)
112
- rspec (~> 2.8.0)
112
+ rspec-core (~> 2.13.0)
113
+ rspec-expectations (~> 2.13.0)
114
+ rspec-mocks (~> 2.13.0)
113
115
  shoulda-context (1.0.1)
114
116
  sprockets (2.2.2)
115
117
  hike (~> 1.2)
@@ -121,8 +123,8 @@ GEM
121
123
  actionpack (~> 3.1)
122
124
  activemodel (~> 3.1)
123
125
  railties (~> 3.1)
124
- thor (0.16.0)
125
- tilt (1.3.3)
126
+ thor (0.17.0)
127
+ tilt (1.3.6)
126
128
  treetop (1.4.12)
127
129
  polyglot
128
130
  polyglot (>= 0.3.1)
@@ -142,7 +144,8 @@ DEPENDENCIES
142
144
  jruby-openssl
143
145
  rails (~> 3.0)
144
146
  rake (>= 0.9.2)
145
- rspec-rails (~> 2.8.1)
147
+ rspec (~> 2.13)
148
+ rspec-rails (~> 2.13)
146
149
  shoulda-context (~> 1.0.0)
147
150
  shoulda-matchers!
148
151
  sqlite3
data/NEWS.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # HEAD
2
2
 
3
+ # v 1.5.1
4
+ * Bump version depedency of Bourne to allow for Mocha upgrade.
5
+ * Should fix incompatiblity with MiniTest.
6
+
3
7
  # v 1.5.0
4
8
  * Deprecate the following matchers:
5
9
  * assign_to
data/README.md CHANGED
@@ -1,4 +1,4 @@
1
- # shoulda-matchers [![Build Status](https://secure.travis-ci.org/thoughtbot/shoulda-matchers.png?branch=master)](http://travis-ci.org/thoughtbot/shoulda-matchers)
1
+ # shoulda-matchers [![Gem Version](https://badge.fury.io/rb/shoulda-matchers.png)](http://badge.fury.io/rb/shoulda-matchers) [![Build Status](https://secure.travis-ci.org/thoughtbot/shoulda-matchers.png?branch=master)](http://travis-ci.org/thoughtbot/shoulda-matchers)
2
2
 
3
3
  [Official Documentation](http://rubydoc.info/github/thoughtbot/shoulda-matchers/master/frames)
4
4
 
data/features/step_definitions/rails_steps.rb CHANGED
@@ -25,8 +25,9 @@ When 'I generate a new rails application' do
25
25
  And I set the "BUNDLE_GEMFILE" environment variable to "Gemfile"
26
26
  And I successfully run `bundle install --local`
27
27
  }
28
+
28
29
  if RUBY_VERSION >= '1.9.3'
29
- append_to_gemfile %(gem 'rake', '~> 0.9.3.beta.1')
30
+ append_to_gemfile %(gem 'rake', '~> 0.9')
30
31
  step %(I successfully run `bundle update rake`)
31
32
  end
32
33
  end
@@ -52,21 +53,21 @@ When 'I run the rspec generator' do
52
53
  end
53
54
 
54
55
  When 'I configure the application to use rspec-rails' do
55
- append_to_gemfile %q(gem 'rspec-rails', '~> 2.8.1')
56
+ append_to_gemfile %q(gem 'rspec-rails', '~> 2.13')
56
57
  steps %{And I run `bundle install --local`}
57
58
  end
58
59
 
59
60
  When 'I configure the application to use rspec-rails in test and development' do
60
61
  append_to_gemfile <<-GEMFILE
61
62
  group :test, :development do
62
- gem 'rspec-rails', '~> 2.8.1'
63
+ gem 'rspec-rails', '~> 2.13'
63
64
  end
64
65
  GEMFILE
65
66
  steps %{And I run `bundle install --local`}
66
67
  end
67
68
 
68
69
  When 'I configure the application to use shoulda-context' do
69
- append_to_gemfile %q(gem 'shoulda-context', '~> 1.0.0')
70
+ append_to_gemfile %q(gem 'shoulda-context', '~> 1.0')
70
71
  steps %{And I run `bundle install --local`}
71
72
  end
72
73
 
data/gemfiles/3.0.gemfile CHANGED
@@ -1,6 +1,6 @@
1
1
  # This file was generated by Appraisal
2
2
 
3
- source "http://rubygems.org"
3
+ source "https://rubygems.org"
4
4
 
5
5
  gem "shoulda-context", "~> 1.0.0"
6
6
  gem "sqlite3", :platform=>:ruby
data/gemfiles/3.0.gemfile.lock CHANGED
@@ -1,20 +1,20 @@
1
1
  PATH
2
2
  remote: /Users/draper/Dropbox/Development/shoulda-matchers
3
3
  specs:
4
- shoulda-matchers (1.5.0)
4
+ shoulda-matchers (1.5.1)
5
5
  activesupport (>= 3.0.0)
6
- bourne (~> 1.2.0)
6
+ bourne (~> 1.3)
7
7
 
8
8
  GEM
9
- remote: http://rubygems.org/
9
+ remote: https://rubygems.org/
10
10
  specs:
11
11
  abstract (1.0.0)
12
- actionmailer (3.0.17)
13
- actionpack (= 3.0.17)
12
+ actionmailer (3.0.20)
13
+ actionpack (= 3.0.20)
14
14
  mail (~> 2.2.19)
15
- actionpack (3.0.17)
16
- activemodel (= 3.0.17)
17
- activesupport (= 3.0.17)
15
+ actionpack (3.0.20)
16
+ activemodel (= 3.0.20)
17
+ activesupport (= 3.0.20)
18
18
  builder (~> 2.1.2)
19
19
  erubis (~> 2.6.6)
20
20
  i18n (~> 0.5.0)
@@ -22,19 +22,19 @@ GEM
22
22
  rack-mount (~> 0.6.14)
23
23
  rack-test (~> 0.5.7)
24
24
  tzinfo (~> 0.3.23)
25
- activemodel (3.0.17)
26
- activesupport (= 3.0.17)
25
+ activemodel (3.0.20)
26
+ activesupport (= 3.0.20)
27
27
  builder (~> 2.1.2)
28
28
  i18n (~> 0.5.0)
29
- activerecord (3.0.17)
30
- activemodel (= 3.0.17)
31
- activesupport (= 3.0.17)
29
+ activerecord (3.0.20)
30
+ activemodel (= 3.0.20)
31
+ activesupport (= 3.0.20)
32
32
  arel (~> 2.0.10)
33
33
  tzinfo (~> 0.3.23)
34
- activeresource (3.0.17)
35
- activemodel (= 3.0.17)
36
- activesupport (= 3.0.17)
37
- activesupport (3.0.17)
34
+ activeresource (3.0.20)
35
+ activemodel (= 3.0.20)
36
+ activesupport (= 3.0.20)
37
+ activesupport (3.0.20)
38
38
  appraisal (0.5.1)
39
39
  bundler
40
40
  rake
@@ -43,72 +43,75 @@ GEM
43
43
  childprocess (~> 0.3.6)
44
44
  cucumber (>= 1.1.1)
45
45
  rspec-expectations (>= 2.7.0)
46
- bourne (1.2.1)
47
- mocha (= 0.12.7)
46
+ bourne (1.4.0)
47
+ mocha (~> 0.13.2)
48
48
  builder (2.1.2)
49
- childprocess (0.3.6)
50
- ffi (~> 1.0, >= 1.0.6)
51
- cucumber (1.2.1)
49
+ childprocess (0.3.9)
50
+ ffi (~> 1.0, >= 1.0.11)
51
+ cucumber (1.2.3)
52
52
  builder (>= 2.1.2)
53
53
  diff-lcs (>= 1.1.3)
54
- gherkin (~> 2.11.0)
55
- json (>= 1.4.6)
56
- diff-lcs (1.1.3)
54
+ gherkin (~> 2.11.6)
55
+ multi_json (~> 1.3)
56
+ diff-lcs (1.2.1)
57
57
  erubis (2.6.6)
58
58
  abstract (>= 1.0.0)
59
- ffi (1.3.1)
60
- gherkin (2.11.5)
61
- json (>= 1.4.6)
59
+ ffi (1.4.0)
60
+ gherkin (2.11.6)
61
+ json (>= 1.7.6)
62
62
  i18n (0.5.0)
63
- json (1.7.6)
63
+ json (1.7.7)
64
64
  mail (2.2.19)
65
65
  activesupport (>= 2.3.6)
66
66
  i18n (>= 0.4.0)
67
67
  mime-types (~> 1.16)
68
68
  treetop (~> 1.4.8)
69
69
  metaclass (0.0.1)
70
- mime-types (1.19)
71
- mocha (0.12.7)
70
+ mime-types (1.21)
71
+ mocha (0.13.3)
72
72
  metaclass (~> 0.0.1)
73
+ multi_json (1.7.1)
73
74
  polyglot (0.3.3)
74
- rack (1.2.7)
75
+ rack (1.2.8)
75
76
  rack-mount (0.6.14)
76
77
  rack (>= 1.0.0)
77
78
  rack-test (0.5.7)
78
79
  rack (>= 1.0)
79
- rails (3.0.17)
80
- actionmailer (= 3.0.17)
81
- actionpack (= 3.0.17)
82
- activerecord (= 3.0.17)
83
- activeresource (= 3.0.17)
84
- activesupport (= 3.0.17)
80
+ rails (3.0.20)
81
+ actionmailer (= 3.0.20)
82
+ actionpack (= 3.0.20)
83
+ activerecord (= 3.0.20)
84
+ activeresource (= 3.0.20)
85
+ activesupport (= 3.0.20)
85
86
  bundler (~> 1.0)
86
- railties (= 3.0.17)
87
- railties (3.0.17)
88
- actionpack (= 3.0.17)
89
- activesupport (= 3.0.17)
87
+ railties (= 3.0.20)
88
+ railties (3.0.20)
89
+ actionpack (= 3.0.20)
90
+ activesupport (= 3.0.20)
90
91
  rake (>= 0.8.7)
91
92
  rdoc (~> 3.4)
92
93
  thor (~> 0.14.4)
93
94
  rake (10.0.3)
94
- rdoc (3.12)
95
+ rdoc (3.12.2)
95
96
  json (~> 1.4)
96
- rspec (2.8.0)
97
- rspec-core (~> 2.8.0)
98
- rspec-expectations (~> 2.8.0)
99
- rspec-mocks (~> 2.8.0)
100
- rspec-core (2.8.0)
101
- rspec-expectations (2.8.0)
102
- diff-lcs (~> 1.1.2)
103
- rspec-mocks (2.8.0)
104
- rspec-rails (2.8.1)
97
+ rspec (2.13.0)
98
+ rspec-core (~> 2.13.0)
99
+ rspec-expectations (~> 2.13.0)
100
+ rspec-mocks (~> 2.13.0)
101
+ rspec-core (2.13.1)
102
+ rspec-expectations (2.13.0)
103
+ diff-lcs (>= 1.1.3, < 2.0)
104
+ rspec-mocks (2.13.0)
105
+ rspec-rails (2.13.0)
105
106
  actionpack (>= 3.0)
106
107
  activesupport (>= 3.0)
107
108
  railties (>= 3.0)
108
- rspec (~> 2.8.0)
109
+ rspec-core (~> 2.13.0)
110
+ rspec-expectations (~> 2.13.0)
111
+ rspec-mocks (~> 2.13.0)
109
112
  shoulda-context (1.0.2)
110
113
  sqlite3 (1.3.7)
111
- strong_parameters (0.1.6)
114
+ strong_parameters (0.2.0)
112
115
  actionpack (~> 3.0)
113
116
  activemodel (~> 3.0)
114
117
  railties (~> 3.0)
@@ -116,7 +119,7 @@ GEM
116
119
  treetop (1.4.12)
117
120
  polyglot
118
121
  polyglot (>= 0.3.1)
119
- tzinfo (0.3.35)
122
+ tzinfo (0.3.37)
120
123
 
121
124
  PLATFORMS
122
125
  ruby
@@ -132,7 +135,8 @@ DEPENDENCIES
132
135
  jruby-openssl
133
136
  rails (~> 3.0.17)
134
137
  rake (>= 0.9.2)
135
- rspec-rails (~> 2.8.1)
138
+ rspec (~> 2.13)
139
+ rspec-rails (~> 2.13)
136
140
  shoulda-context (~> 1.0.0)
137
141
  shoulda-matchers!
138
142
  sqlite3
data/gemfiles/3.1.gemfile CHANGED
@@ -1,6 +1,6 @@
1
1
  # This file was generated by Appraisal
2
2
 
3
- source "http://rubygems.org"
3
+ source "https://rubygems.org"
4
4
 
5
5
  gem "shoulda-context", "~> 1.0.0"
6
6
  gem "sqlite3", :platform=>:ruby
data/gemfiles/3.1.gemfile.lock CHANGED
@@ -1,19 +1,19 @@
1
1
  PATH
2
2
  remote: /Users/draper/Dropbox/Development/shoulda-matchers
3
3
  specs:
4
- shoulda-matchers (1.5.0)
4
+ shoulda-matchers (1.5.1)
5
5
  activesupport (>= 3.0.0)
6
- bourne (~> 1.2.0)
6
+ bourne (~> 1.3)
7
7
 
8
8
  GEM
9
- remote: http://rubygems.org/
9
+ remote: https://rubygems.org/
10
10
  specs:
11
- actionmailer (3.1.8)
12
- actionpack (= 3.1.8)
11
+ actionmailer (3.1.11)
12
+ actionpack (= 3.1.11)
13
13
  mail (~> 2.3.3)
14
- actionpack (3.1.8)
15
- activemodel (= 3.1.8)
16
- activesupport (= 3.1.8)
14
+ actionpack (3.1.11)
15
+ activemodel (= 3.1.11)
16
+ activesupport (= 3.1.11)
17
17
  builder (~> 3.0.0)
18
18
  erubis (~> 2.7.0)
19
19
  i18n (~> 0.6)
@@ -22,20 +22,20 @@ GEM
22
22
  rack-mount (~> 0.8.2)
23
23
  rack-test (~> 0.6.1)
24
24
  sprockets (~> 2.0.4)
25
- activemodel (3.1.8)
26
- activesupport (= 3.1.8)
25
+ activemodel (3.1.11)
26
+ activesupport (= 3.1.11)
27
27
  builder (~> 3.0.0)
28
28
  i18n (~> 0.6)
29
- activerecord (3.1.8)
30
- activemodel (= 3.1.8)
31
- activesupport (= 3.1.8)
29
+ activerecord (3.1.11)
30
+ activemodel (= 3.1.11)
31
+ activesupport (= 3.1.11)
32
32
  arel (~> 2.2.3)
33
33
  tzinfo (~> 0.3.29)
34
- activeresource (3.1.8)
35
- activemodel (= 3.1.8)
36
- activesupport (= 3.1.8)
37
- activesupport (3.1.8)
38
- multi_json (>= 1.0, < 1.3)
34
+ activeresource (3.1.11)
35
+ activemodel (= 3.1.11)
36
+ activesupport (= 3.1.11)
37
+ activesupport (3.1.11)
38
+ multi_json (~> 1.0)
39
39
  appraisal (0.5.1)
40
40
  bundler
41
41
  rake
@@ -44,78 +44,80 @@ GEM
44
44
  childprocess (~> 0.3.6)
45
45
  cucumber (>= 1.1.1)
46
46
  rspec-expectations (>= 2.7.0)
47
- bourne (1.2.1)
48
- mocha (= 0.12.7)
47
+ bourne (1.4.0)
48
+ mocha (~> 0.13.2)
49
49
  builder (3.0.4)
50
- childprocess (0.3.6)
51
- ffi (~> 1.0, >= 1.0.6)
52
- cucumber (1.2.1)
50
+ childprocess (0.3.9)
51
+ ffi (~> 1.0, >= 1.0.11)
52
+ cucumber (1.2.3)
53
53
  builder (>= 2.1.2)
54
54
  diff-lcs (>= 1.1.3)
55
- gherkin (~> 2.11.0)
56
- json (>= 1.4.6)
57
- diff-lcs (1.1.3)
55
+ gherkin (~> 2.11.6)
56
+ multi_json (~> 1.3)
57
+ diff-lcs (1.2.1)
58
58
  erubis (2.7.0)
59
- ffi (1.3.1)
60
- gherkin (2.11.5)
61
- json (>= 1.4.6)
59
+ ffi (1.4.0)
60
+ gherkin (2.11.6)
61
+ json (>= 1.7.6)
62
62
  hike (1.2.1)
63
- i18n (0.6.1)
64
- jquery-rails (2.2.0)
63
+ i18n (0.6.4)
64
+ jquery-rails (2.2.1)
65
65
  railties (>= 3.0, < 5.0)
66
66
  thor (>= 0.14, < 2.0)
67
- json (1.7.6)
67
+ json (1.7.7)
68
68
  mail (2.3.3)
69
69
  i18n (>= 0.4.0)
70
70
  mime-types (~> 1.16)
71
71
  treetop (~> 1.4.8)
72
72
  metaclass (0.0.1)
73
- mime-types (1.19)
74
- mocha (0.12.7)
73
+ mime-types (1.21)
74
+ mocha (0.13.3)
75
75
  metaclass (~> 0.0.1)
76
- multi_json (1.2.0)
76
+ multi_json (1.7.1)
77
77
  polyglot (0.3.3)
78
- rack (1.3.9)
78
+ rack (1.3.10)
79
79
  rack-cache (1.2)
80
80
  rack (>= 0.4)
81
81
  rack-mount (0.8.3)
82
82
  rack (>= 1.0.0)
83
- rack-ssl (1.3.2)
83
+ rack-ssl (1.3.3)
84
84
  rack
85
85
  rack-test (0.6.2)
86
86
  rack (>= 1.0)
87
- rails (3.1.8)
88
- actionmailer (= 3.1.8)
89
- actionpack (= 3.1.8)
90
- activerecord (= 3.1.8)
91
- activeresource (= 3.1.8)
92
- activesupport (= 3.1.8)
87
+ rails (3.1.11)
88
+ actionmailer (= 3.1.11)
89
+ actionpack (= 3.1.11)
90
+ activerecord (= 3.1.11)
91
+ activeresource (= 3.1.11)
92
+ activesupport (= 3.1.11)
93
93
  bundler (~> 1.0)
94
- railties (= 3.1.8)
95
- railties (3.1.8)
96
- actionpack (= 3.1.8)
97
- activesupport (= 3.1.8)
94
+ railties (= 3.1.11)
95
+ railties (3.1.11)
96
+ actionpack (= 3.1.11)
97
+ activesupport (= 3.1.11)
98
98
  rack-ssl (~> 1.3.2)
99
99
  rake (>= 0.8.7)
100
100
  rdoc (~> 3.4)
101
101
  thor (~> 0.14.6)
102
102
  rake (10.0.3)
103
- rdoc (3.12)
103
+ rdoc (3.12.2)
104
104
  json (~> 1.4)
105
- rspec (2.8.0)
106
- rspec-core (~> 2.8.0)
107
- rspec-expectations (~> 2.8.0)
108
- rspec-mocks (~> 2.8.0)
109
- rspec-core (2.8.0)
110
- rspec-expectations (2.8.0)
111
- diff-lcs (~> 1.1.2)
112
- rspec-mocks (2.8.0)
113
- rspec-rails (2.8.1)
105
+ rspec (2.13.0)
106
+ rspec-core (~> 2.13.0)
107
+ rspec-expectations (~> 2.13.0)
108
+ rspec-mocks (~> 2.13.0)
109
+ rspec-core (2.13.1)
110
+ rspec-expectations (2.13.0)
111
+ diff-lcs (>= 1.1.3, < 2.0)
112
+ rspec-mocks (2.13.0)
113
+ rspec-rails (2.13.0)
114
114
  actionpack (>= 3.0)
115
115
  activesupport (>= 3.0)
116
116
  railties (>= 3.0)
117
- rspec (~> 2.8.0)
118
- sass (3.2.5)
117
+ rspec-core (~> 2.13.0)
118
+ rspec-expectations (~> 2.13.0)
119
+ rspec-mocks (~> 2.13.0)
120
+ sass (3.2.7)
119
121
  sass-rails (3.1.6)
120
122
  actionpack (~> 3.1.0)
121
123
  railties (~> 3.1.0)
@@ -127,16 +129,16 @@ GEM
127
129
  rack (~> 1.0)
128
130
  tilt (~> 1.1, != 1.3.0)
129
131
  sqlite3 (1.3.7)
130
- strong_parameters (0.1.6)
132
+ strong_parameters (0.2.0)
131
133
  actionpack (~> 3.0)
132
134
  activemodel (~> 3.0)
133
135
  railties (~> 3.0)
134
136
  thor (0.14.6)
135
- tilt (1.3.3)
137
+ tilt (1.3.6)
136
138
  treetop (1.4.12)
137
139
  polyglot
138
140
  polyglot (>= 0.3.1)
139
- tzinfo (0.3.35)
141
+ tzinfo (0.3.37)
140
142
 
141
143
  PLATFORMS
142
144
  ruby
@@ -153,7 +155,8 @@ DEPENDENCIES
153
155
  jruby-openssl
154
156
  rails (~> 3.1.8)
155
157
  rake (>= 0.9.2)
156
- rspec-rails (~> 2.8.1)
158
+ rspec (~> 2.13)
159
+ rspec-rails (~> 2.13)
157
160
  sass-rails
158
161
  shoulda-context (~> 1.0.0)
159
162
  shoulda-matchers!
data/gemfiles/3.2.gemfile CHANGED
@@ -1,6 +1,6 @@
1
1
  # This file was generated by Appraisal
2
2
 
3
- source "http://rubygems.org"
3
+ source "https://rubygems.org"
4
4
 
5
5
  gem "shoulda-context", "~> 1.0.0"
6
6
  gem "sqlite3", :platform=>:ruby
data/gemfiles/3.2.gemfile.lock CHANGED
@@ -1,39 +1,39 @@
1
1
  PATH
2
2
  remote: /Users/draper/Dropbox/Development/shoulda-matchers
3
3
  specs:
4
- shoulda-matchers (1.5.0)
4
+ shoulda-matchers (1.5.1)
5
5
  activesupport (>= 3.0.0)
6
- bourne (~> 1.2.0)
6
+ bourne (~> 1.3)
7
7
 
8
8
  GEM
9
- remote: http://rubygems.org/
9
+ remote: https://rubygems.org/
10
10
  specs:
11
- actionmailer (3.2.9)
12
- actionpack (= 3.2.9)
13
- mail (~> 2.4.4)
14
- actionpack (3.2.9)
15
- activemodel (= 3.2.9)
16
- activesupport (= 3.2.9)
11
+ actionmailer (3.2.13)
12
+ actionpack (= 3.2.13)
13
+ mail (~> 2.5.3)
14
+ actionpack (3.2.13)
15
+ activemodel (= 3.2.13)
16
+ activesupport (= 3.2.13)
17
17
  builder (~> 3.0.0)
18
18
  erubis (~> 2.7.0)
19
19
  journey (~> 1.0.4)
20
- rack (~> 1.4.0)
20
+ rack (~> 1.4.5)
21
21
  rack-cache (~> 1.2)
22
22
  rack-test (~> 0.6.1)
23
23
  sprockets (~> 2.2.1)
24
- activemodel (3.2.9)
25
- activesupport (= 3.2.9)
24
+ activemodel (3.2.13)
25
+ activesupport (= 3.2.13)
26
26
  builder (~> 3.0.0)
27
- activerecord (3.2.9)
28
- activemodel (= 3.2.9)
29
- activesupport (= 3.2.9)
27
+ activerecord (3.2.13)
28
+ activemodel (= 3.2.13)
29
+ activesupport (= 3.2.13)
30
30
  arel (~> 3.0.2)
31
31
  tzinfo (~> 0.3.29)
32
- activeresource (3.2.9)
33
- activemodel (= 3.2.9)
34
- activesupport (= 3.2.9)
35
- activesupport (3.2.9)
36
- i18n (~> 0.6)
32
+ activeresource (3.2.13)
33
+ activemodel (= 3.2.13)
34
+ activesupport (= 3.2.13)
35
+ activesupport (3.2.13)
36
+ i18n (= 0.6.1)
37
37
  multi_json (~> 1.0)
38
38
  appraisal (0.5.1)
39
39
  bundler
@@ -43,77 +43,79 @@ GEM
43
43
  childprocess (~> 0.3.6)
44
44
  cucumber (>= 1.1.1)
45
45
  rspec-expectations (>= 2.7.0)
46
- bourne (1.2.1)
47
- mocha (= 0.12.7)
46
+ bourne (1.4.0)
47
+ mocha (~> 0.13.2)
48
48
  builder (3.0.4)
49
- childprocess (0.3.6)
50
- ffi (~> 1.0, >= 1.0.6)
51
- cucumber (1.2.1)
49
+ childprocess (0.3.9)
50
+ ffi (~> 1.0, >= 1.0.11)
51
+ cucumber (1.2.3)
52
52
  builder (>= 2.1.2)
53
53
  diff-lcs (>= 1.1.3)
54
- gherkin (~> 2.11.0)
55
- json (>= 1.4.6)
56
- diff-lcs (1.1.3)
54
+ gherkin (~> 2.11.6)
55
+ multi_json (~> 1.3)
56
+ diff-lcs (1.2.1)
57
57
  erubis (2.7.0)
58
- ffi (1.3.1)
59
- gherkin (2.11.5)
60
- json (>= 1.4.6)
58
+ ffi (1.4.0)
59
+ gherkin (2.11.6)
60
+ json (>= 1.7.6)
61
61
  hike (1.2.1)
62
62
  i18n (0.6.1)
63
63
  journey (1.0.4)
64
- jquery-rails (2.2.0)
64
+ jquery-rails (2.2.1)
65
65
  railties (>= 3.0, < 5.0)
66
66
  thor (>= 0.14, < 2.0)
67
- json (1.7.6)
68
- mail (2.4.4)
67
+ json (1.7.7)
68
+ mail (2.5.3)
69
69
  i18n (>= 0.4.0)
70
70
  mime-types (~> 1.16)
71
71
  treetop (~> 1.4.8)
72
72
  metaclass (0.0.1)
73
- mime-types (1.19)
74
- mocha (0.12.7)
73
+ mime-types (1.21)
74
+ mocha (0.13.3)
75
75
  metaclass (~> 0.0.1)
76
- multi_json (1.5.0)
76
+ multi_json (1.7.1)
77
77
  polyglot (0.3.3)
78
- rack (1.4.4)
78
+ rack (1.4.5)
79
79
  rack-cache (1.2)
80
80
  rack (>= 0.4)
81
- rack-ssl (1.3.2)
81
+ rack-ssl (1.3.3)
82
82
  rack
83
83
  rack-test (0.6.2)
84
84
  rack (>= 1.0)
85
- rails (3.2.9)
86
- actionmailer (= 3.2.9)
87
- actionpack (= 3.2.9)
88
- activerecord (= 3.2.9)
89
- activeresource (= 3.2.9)
90
- activesupport (= 3.2.9)
85
+ rails (3.2.13)
86
+ actionmailer (= 3.2.13)
87
+ actionpack (= 3.2.13)
88
+ activerecord (= 3.2.13)
89
+ activeresource (= 3.2.13)
90
+ activesupport (= 3.2.13)
91
91
  bundler (~> 1.0)
92
- railties (= 3.2.9)
93
- railties (3.2.9)
94
- actionpack (= 3.2.9)
95
- activesupport (= 3.2.9)
92
+ railties (= 3.2.13)
93
+ railties (3.2.13)
94
+ actionpack (= 3.2.13)
95
+ activesupport (= 3.2.13)
96
96
  rack-ssl (~> 1.3.2)
97
97
  rake (>= 0.8.7)
98
98
  rdoc (~> 3.4)
99
99
  thor (>= 0.14.6, < 2.0)
100
100
  rake (10.0.3)
101
- rdoc (3.12)
101
+ rdoc (3.12.2)
102
102
  json (~> 1.4)
103
- rspec (2.8.0)
104
- rspec-core (~> 2.8.0)
105
- rspec-expectations (~> 2.8.0)
106
- rspec-mocks (~> 2.8.0)
107
- rspec-core (2.8.0)
108
- rspec-expectations (2.8.0)
109
- diff-lcs (~> 1.1.2)
110
- rspec-mocks (2.8.0)
111
- rspec-rails (2.8.1)
103
+ rspec (2.13.0)
104
+ rspec-core (~> 2.13.0)
105
+ rspec-expectations (~> 2.13.0)
106
+ rspec-mocks (~> 2.13.0)
107
+ rspec-core (2.13.1)
108
+ rspec-expectations (2.13.0)
109
+ diff-lcs (>= 1.1.3, < 2.0)
110
+ rspec-mocks (2.13.0)
111
+ rspec-rails (2.13.0)
112
112
  actionpack (>= 3.0)
113
113
  activesupport (>= 3.0)
114
114
  railties (>= 3.0)
115
- rspec (~> 2.8.0)
116
- sass (3.2.5)
115
+ rspec-core (~> 2.13.0)
116
+ rspec-expectations (~> 2.13.0)
117
+ rspec-mocks (~> 2.13.0)
118
+ sass (3.2.7)
117
119
  sass-rails (3.2.6)
118
120
  railties (~> 3.2.0)
119
121
  sass (>= 3.1.10)
@@ -125,16 +127,16 @@ GEM
125
127
  rack (~> 1.0)
126
128
  tilt (~> 1.1, != 1.3.0)
127
129
  sqlite3 (1.3.7)
128
- strong_parameters (0.1.6)
130
+ strong_parameters (0.2.0)
129
131
  actionpack (~> 3.0)
130
132
  activemodel (~> 3.0)
131
133
  railties (~> 3.0)
132
- thor (0.16.0)
133
- tilt (1.3.3)
134
+ thor (0.17.0)
135
+ tilt (1.3.6)
134
136
  treetop (1.4.12)
135
137
  polyglot
136
138
  polyglot (>= 0.3.1)
137
- tzinfo (0.3.35)
139
+ tzinfo (0.3.37)
138
140
 
139
141
  PLATFORMS
140
142
  ruby
@@ -151,7 +153,8 @@ DEPENDENCIES
151
153
  jruby-openssl
152
154
  rails (~> 3.2.8)
153
155
  rake (>= 0.9.2)
154
- rspec-rails (~> 2.8.1)
156
+ rspec (~> 2.13)
157
+ rspec-rails (~> 2.13)
155
158
  sass-rails
156
159
  shoulda-context (~> 1.0.0)
157
160
  shoulda-matchers!
data/lib/shoulda/matchers/integrations/rspec.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # :enddoc:
2
- require 'rspec'
2
+ require 'rspec/rails'
3
3
 
4
4
  RSpec.configure do |config|
5
5
  require 'shoulda/matchers/independent'
data/lib/shoulda/matchers/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Shoulda
2
2
  module Matchers
3
- VERSION = '1.5.0'.freeze
3
+ VERSION = '1.5.1'.freeze
4
4
  end
5
5
  end
data/shoulda-matchers.gemspec CHANGED
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
19
19
  s.require_paths = ["lib"]
20
20
 
21
21
  s.add_dependency('activesupport', '>= 3.0.0')
22
- s.add_dependency('bourne', '~> 1.2.0')
22
+ s.add_dependency('bourne', '~> 1.3')
23
23
 
24
24
  s.add_development_dependency('appraisal', '~> 0.4')
25
25
  s.add_development_dependency('aruba')
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
27
27
  s.add_development_dependency('cucumber', '~> 1.1')
28
28
  s.add_development_dependency('rails', '~> 3.0')
29
29
  s.add_development_dependency('rake', '>= 0.9.2')
30
- s.add_development_dependency('rspec-rails', '~> 2.8.1')
30
+ s.add_development_dependency('rspec', '~> 2.13')
31
+ s.add_development_dependency('rspec-rails', '~> 2.13')
31
32
  s.add_development_dependency('strong_parameters')
32
33
  end
data/spec/shoulda/matchers/active_record/association_matcher_spec.rb CHANGED
@@ -178,10 +178,12 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
178
178
 
179
179
  it 'rejects an association that has the wrong :through option' do
180
180
  define_model :child
181
+
181
182
  define_model :conception, :child_id => :integer,
182
183
  :parent_id => :integer do
183
184
  belongs_to :child
184
- end
185
+ end
186
+
185
187
  define_model :parent do
186
188
  has_many :conceptions
187
189
  has_many :relationships
@@ -264,6 +266,7 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
264
266
  define_model :child, :ancestor_id => :integer do
265
267
  belongs_to :ancestor, :inverse_of => :children, :class_name => :Parent
266
268
  end
269
+
267
270
  define_model :parent do
268
271
  has_many :children, :inverse_of => :ancestor
269
272
  end
@@ -275,6 +278,7 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
275
278
  define_model :child, :mother_id => :integer do
276
279
  belongs_to :mother, :inverse_of => :children, :class_name => :Parent
277
280
  end
281
+
278
282
  define_model :parent do
279
283
  has_many :children, :inverse_of => :ancestor
280
284
  end
data/spec/support/model_builder.rb CHANGED
@@ -7,6 +7,7 @@ module ModelBuilder
7
7
 
8
8
  after do
9
9
  drop_created_tables
10
+ ActiveSupport::Dependencies.clear
10
11
  end
11
12
  end
12
13
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: shoulda-matchers
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.0
4
+ version: 1.5.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -14,7 +14,7 @@ authors:
14
14
  autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
- date: 2013-03-15 00:00:00.000000000 Z
17
+ date: 2013-03-19 00:00:00.000000000 Z
18
18
  dependencies:
19
19
  - !ruby/object:Gem::Dependency
20
20
  name: activesupport
@@ -39,7 +39,7 @@ dependencies:
39
39
  requirements:
40
40
  - - ~>
41
41
  - !ruby/object:Gem::Version
42
- version: 1.2.0
42
+ version: '1.3'
43
43
  type: :runtime
44
44
  prerelease: false
45
45
  version_requirements: !ruby/object:Gem::Requirement
@@ -47,7 +47,7 @@ dependencies:
47
47
  requirements:
48
48
  - - ~>
49
49
  - !ruby/object:Gem::Version
50
- version: 1.2.0
50
+ version: '1.3'
51
51
  - !ruby/object:Gem::Dependency
52
52
  name: appraisal
53
53
  requirement: !ruby/object:Gem::Requirement
@@ -144,6 +144,22 @@ dependencies:
144
144
  - - ! '>='
145
145
  - !ruby/object:Gem::Version
146
146
  version: 0.9.2
147
+ - !ruby/object:Gem::Dependency
148
+ name: rspec
149
+ requirement: !ruby/object:Gem::Requirement
150
+ none: false
151
+ requirements:
152
+ - - ~>
153
+ - !ruby/object:Gem::Version
154
+ version: '2.13'
155
+ type: :development
156
+ prerelease: false
157
+ version_requirements: !ruby/object:Gem::Requirement
158
+ none: false
159
+ requirements:
160
+ - - ~>
161
+ - !ruby/object:Gem::Version
162
+ version: '2.13'
147
163
  - !ruby/object:Gem::Dependency
148
164
  name: rspec-rails
149
165
  requirement: !ruby/object:Gem::Requirement
@@ -151,7 +167,7 @@ dependencies:
151
167
  requirements:
152
168
  - - ~>
153
169
  - !ruby/object:Gem::Version
154
- version: 2.8.1
170
+ version: '2.13'
155
171
  type: :development
156
172
  prerelease: false
157
173
  version_requirements: !ruby/object:Gem::Requirement
@@ -159,7 +175,7 @@ dependencies:
159
175
  requirements:
160
176
  - - ~>
161
177
  - !ruby/object:Gem::Version
162
- version: 2.8.1
178
+ version: '2.13'
163
179
  - !ruby/object:Gem::Dependency
164
180
  name: strong_parameters
165
181
  requirement: !ruby/object:Gem::Requirement
@@ -309,7 +325,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
309
325
  version: '0'
310
326
  segments:
311
327
  - 0
312
- hash: -1249143589837050038
328
+ hash: -1367983443848966676
313
329
  required_rubygems_version: !ruby/object:Gem::Requirement
314
330
  none: false
315
331
  requirements:
@@ -318,7 +334,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
318
334
  version: '0'
319
335
  segments:
320
336
  - 0
321
- hash: -1249143589837050038
337
+ hash: -1367983443848966676
322
338
  requirements: []
323
339
  rubyforge_project:
324
340
  rubygems_version: 1.8.23