shoulda-matchers 2.6.2 → 2.7.0

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 (68) hide show
  1. checksums.yaml +4 -4
  2. data/Appraisals +6 -1
  3. data/Gemfile +1 -1
  4. data/Gemfile.lock +26 -22
  5. data/NEWS.md +52 -1
  6. data/README.md +8 -6
  7. data/Rakefile +1 -1
  8. data/doc_config/gh-pages/index.html.erb +1 -1
  9. data/doc_config/yard/templates/default/fulldoc/html/css/global.css +1 -1
  10. data/doc_config/yard/templates/default/fulldoc/html/css/style.css +26 -0
  11. data/features/rails_integration.feature +18 -3
  12. data/features/step_definitions/rails_steps.rb +21 -3
  13. data/gemfiles/3.0.gemfile +1 -1
  14. data/gemfiles/3.0.gemfile.lock +30 -24
  15. data/gemfiles/3.1.gemfile +1 -1
  16. data/gemfiles/3.1.gemfile.lock +32 -26
  17. data/gemfiles/3.1_1.9.2.gemfile +1 -1
  18. data/gemfiles/3.1_1.9.2.gemfile.lock +22 -19
  19. data/gemfiles/3.2.gemfile +1 -1
  20. data/gemfiles/3.2.gemfile.lock +32 -26
  21. data/gemfiles/3.2_1.9.2.gemfile +1 -1
  22. data/gemfiles/3.2_1.9.2.gemfile.lock +8 -8
  23. data/gemfiles/4.0.0.gemfile +2 -2
  24. data/gemfiles/4.0.0.gemfile.lock +35 -31
  25. data/gemfiles/4.0.1.gemfile +2 -2
  26. data/gemfiles/4.0.1.gemfile.lock +24 -22
  27. data/gemfiles/4.1.gemfile +1 -1
  28. data/gemfiles/4.1.gemfile.lock +26 -22
  29. data/lib/shoulda/matchers/action_controller/filter_param_matcher.rb +10 -3
  30. data/lib/shoulda/matchers/action_controller/set_session_matcher.rb +24 -6
  31. data/lib/shoulda/matchers/active_model.rb +2 -2
  32. data/lib/shoulda/matchers/active_model/allow_value_matcher.rb +1 -1
  33. data/lib/shoulda/matchers/active_model/ensure_length_of_matcher.rb +1 -1
  34. data/lib/shoulda/matchers/active_model/validate_absence_of_matcher.rb +5 -3
  35. data/lib/shoulda/matchers/active_model/{ensure_exclusion_of_matcher.rb → validate_exclusion_of_matcher.rb} +20 -10
  36. data/lib/shoulda/matchers/active_model/{ensure_inclusion_of_matcher.rb → validate_inclusion_of_matcher.rb} +52 -28
  37. data/lib/shoulda/matchers/active_model/validate_uniqueness_of_matcher.rb +28 -19
  38. data/lib/shoulda/matchers/active_record.rb +18 -16
  39. data/lib/shoulda/matchers/active_record/accept_nested_attributes_for_matcher.rb +4 -4
  40. data/lib/shoulda/matchers/active_record/association_matcher.rb +17 -12
  41. data/lib/shoulda/matchers/active_record/association_matchers/join_table_matcher.rb +86 -0
  42. data/lib/shoulda/matchers/active_record/association_matchers/model_reflection.rb +19 -0
  43. data/lib/shoulda/matchers/active_record/association_matchers/model_reflector.rb +2 -1
  44. data/lib/shoulda/matchers/active_record/define_enum_for_matcher.rb +138 -0
  45. data/lib/shoulda/matchers/independent.rb +3 -2
  46. data/lib/shoulda/matchers/independent/{delegate_matcher.rb → delegate_method_matcher.rb} +69 -49
  47. data/lib/shoulda/matchers/independent/delegate_method_matcher/stubbed_target.rb +37 -0
  48. data/lib/shoulda/matchers/independent/delegate_method_matcher/target_not_defined_error.rb +15 -0
  49. data/lib/shoulda/matchers/version.rb +1 -1
  50. data/lib/shoulda/matchers/warn.rb +30 -2
  51. data/spec/shoulda/matchers/action_controller/filter_param_matcher_spec.rb +6 -0
  52. data/spec/shoulda/matchers/action_controller/set_session_matcher_spec.rb +67 -5
  53. data/spec/shoulda/matchers/action_controller/strong_parameters_matcher_spec.rb +9 -9
  54. data/spec/shoulda/matchers/active_model/validate_absence_of_matcher_spec.rb +30 -3
  55. data/spec/shoulda/matchers/active_model/{ensure_exclusion_of_matcher_spec.rb → validate_exclusion_of_matcher_spec.rb} +29 -13
  56. data/spec/shoulda/matchers/active_model/{ensure_inclusion_of_matcher_spec.rb → validate_inclusion_of_matcher_spec.rb} +34 -16
  57. data/spec/shoulda/matchers/active_model/validate_uniqueness_of_matcher_spec.rb +35 -0
  58. data/spec/shoulda/matchers/active_record/association_matcher_spec.rb +56 -1
  59. data/spec/shoulda/matchers/active_record/define_enum_for_matcher_spec.rb +101 -0
  60. data/spec/shoulda/matchers/doublespeak/object_double_spec.rb +6 -6
  61. data/spec/shoulda/matchers/independent/{delegate_matcher → delegate_method_matcher}/stubbed_target_spec.rb +1 -1
  62. data/spec/shoulda/matchers/independent/{delegate_matcher_spec.rb → delegate_method_matcher_spec.rb} +88 -29
  63. data/spec/spec_helper.rb +2 -3
  64. data/spec/support/fail_with_message_including_matcher.rb +14 -3
  65. data/spec/support/fail_with_message_matcher.rb +14 -2
  66. data/spec/support/rails_versions.rb +4 -0
  67. metadata +19 -14
  68. data/lib/shoulda/matchers/independent/delegate_matcher/stubbed_target.rb +0 -35
@@ -9,7 +9,6 @@ gem "bundler", "~> 1.1"
9
9
  gem "cucumber", "~> 1.1"
10
10
  gem "pry"
11
11
  gem "rake", ">= 0.9.2"
12
- gem "rspec-rails", ">= 2.13.1", "< 3"
13
12
  gem "yard"
14
13
  gem "redcarpet"
15
14
  gem "pygments.rb"
@@ -22,6 +21,7 @@ gem "jdbc-sqlite3", :platform=>:jruby
22
21
  gem "jruby-openssl", :platform=>:jruby
23
22
  gem "therubyrhino", :platform=>:jruby
24
23
  gem "strong_parameters"
24
+ gem "rspec-rails", "2.99.0"
25
25
  gem "rails", "~> 3.2.13"
26
26
  gem "bcrypt-ruby", "~> 3.0.0"
27
27
  gem "jquery-rails"
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .././
3
3
  specs:
4
- shoulda-matchers (2.6.2)
4
+ shoulda-matchers (2.7.0)
5
5
  activesupport (>= 3.0.0)
6
6
 
7
7
  GEM
@@ -39,7 +39,7 @@ GEM
39
39
  rake
40
40
  thor (>= 0.14.0)
41
41
  arel (3.0.3)
42
- aruba (0.5.4)
42
+ aruba (0.6.0)
43
43
  childprocess (>= 0.3.6)
44
44
  cucumber (>= 1.1.1)
45
45
  rspec-expectations (>= 2.7.0)
@@ -57,7 +57,7 @@ GEM
57
57
  coffee-script-source
58
58
  execjs
59
59
  coffee-script-source (1.7.0)
60
- cucumber (1.3.15)
60
+ cucumber (1.3.16)
61
61
  builder (>= 2.1.2)
62
62
  diff-lcs (>= 1.1.3)
63
63
  gherkin (~> 2.12)
@@ -70,7 +70,7 @@ GEM
70
70
  gherkin (2.12.2)
71
71
  multi_json (~> 1.3)
72
72
  hike (1.2.3)
73
- i18n (0.6.9)
73
+ i18n (0.6.11)
74
74
  journey (1.0.4)
75
75
  jquery-rails (3.1.0)
76
76
  railties (>= 3.0, < 5.0)
@@ -123,10 +123,10 @@ GEM
123
123
  redcarpet (3.1.2)
124
124
  rspec-collection_matchers (1.0.0)
125
125
  rspec-expectations (>= 2.99.0.beta1)
126
- rspec-core (2.99.0)
127
- rspec-expectations (2.99.0)
126
+ rspec-core (2.99.1)
127
+ rspec-expectations (2.99.2)
128
128
  diff-lcs (>= 1.1.3, < 2.0)
129
- rspec-mocks (2.99.1)
129
+ rspec-mocks (2.99.2)
130
130
  rspec-rails (2.99.0)
131
131
  actionpack (>= 3.0)
132
132
  activemodel (>= 3.0)
@@ -188,7 +188,7 @@ DEPENDENCIES
188
188
  rails (~> 3.2.13)
189
189
  rake (>= 0.9.2)
190
190
  redcarpet
191
- rspec-rails (>= 2.13.1, < 3)
191
+ rspec-rails (= 2.99.0)
192
192
  sass-rails (~> 3.2.3)
193
193
  shoulda-context (~> 1.2.0)
194
194
  shoulda-matchers!
@@ -9,7 +9,6 @@ gem "bundler", "~> 1.1"
9
9
  gem "cucumber", "~> 1.1"
10
10
  gem "pry"
11
11
  gem "rake", ">= 0.9.2"
12
- gem "rspec-rails", ">= 2.13.1", "< 3"
13
12
  gem "yard"
14
13
  gem "redcarpet"
15
14
  gem "pygments.rb"
@@ -27,11 +26,12 @@ gem "uglifier", ">= 1.3.0"
27
26
  gem "coffee-rails", "~> 4.0.0"
28
27
  gem "jquery-rails"
29
28
  gem "turbolinks"
30
- gem "jbuilder", "~> 1.2"
31
29
  gem "sdoc"
32
30
  gem "activeresource", "4.0.0"
31
+ gem "rspec-rails", "~> 3.0.1"
33
32
  gem "protected_attributes"
34
33
  gem "rails", "4.0.0"
34
+ gem "jbuilder", "~> 1.2"
35
35
  gem "sass-rails", "~> 4.0.0"
36
36
  gem "bcrypt-ruby", "~> 3.0.0"
37
37
 
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: ../
3
3
  specs:
4
- shoulda-matchers (2.6.2)
4
+ shoulda-matchers (2.7.0)
5
5
  activesupport (>= 3.0.0)
6
6
 
7
7
  GEM
@@ -39,17 +39,16 @@ GEM
39
39
  bundler
40
40
  rake
41
41
  thor (>= 0.14.0)
42
- arel (4.0.1)
43
- aruba (0.5.3)
42
+ arel (4.0.2)
43
+ aruba (0.6.0)
44
44
  childprocess (>= 0.3.6)
45
45
  cucumber (>= 1.1.1)
46
46
  rspec-expectations (>= 2.7.0)
47
- atomic (1.1.14)
48
47
  bcrypt-ruby (3.0.1)
49
48
  bourne (1.5.0)
50
49
  mocha (>= 0.13.2, < 0.15)
51
50
  builder (3.1.4)
52
- childprocess (0.3.9)
51
+ childprocess (0.5.3)
53
52
  ffi (~> 1.0, >= 1.0.11)
54
53
  coderay (1.1.0)
55
54
  coffee-rails (4.0.1)
@@ -59,12 +58,12 @@ GEM
59
58
  coffee-script-source
60
59
  execjs
61
60
  coffee-script-source (1.7.0)
62
- cucumber (1.3.10)
61
+ cucumber (1.3.16)
63
62
  builder (>= 2.1.2)
64
63
  diff-lcs (>= 1.1.3)
65
64
  gherkin (~> 2.12)
66
65
  multi_json (>= 1.7.5, < 2.0)
67
- multi_test (>= 0.0.2)
66
+ multi_test (>= 0.1.1)
68
67
  diff-lcs (1.2.5)
69
68
  erubis (2.7.0)
70
69
  execjs (2.0.2)
@@ -72,7 +71,7 @@ GEM
72
71
  gherkin (2.12.2)
73
72
  multi_json (~> 1.3)
74
73
  hike (1.2.3)
75
- i18n (0.6.5)
74
+ i18n (0.6.11)
76
75
  jbuilder (1.5.3)
77
76
  activesupport (>= 3.0.0)
78
77
  multi_json (>= 1.2.0)
@@ -89,9 +88,9 @@ GEM
89
88
  minitest (4.7.5)
90
89
  mocha (0.14.0)
91
90
  metaclass (~> 0.0.1)
92
- multi_json (1.8.2)
93
- multi_test (0.0.2)
94
- polyglot (0.3.3)
91
+ multi_json (1.10.1)
92
+ multi_test (0.1.1)
93
+ polyglot (0.3.5)
95
94
  posix-spawn (0.3.8)
96
95
  protected_attributes (1.0.3)
97
96
  activemodel (>= 4.0.0, < 5.0)
@@ -120,26 +119,32 @@ GEM
120
119
  activesupport (= 4.0.0)
121
120
  rake (>= 0.8.7)
122
121
  thor (>= 0.18.1, < 2.0)
123
- rake (10.1.1)
122
+ rake (10.3.2)
124
123
  rdoc (4.1.1)
125
124
  json (~> 1.4)
126
125
  redcarpet (3.1.2)
127
- rspec-core (2.14.7)
128
- rspec-expectations (2.14.4)
129
- diff-lcs (>= 1.1.3, < 2.0)
130
- rspec-mocks (2.14.4)
131
- rspec-rails (2.14.0)
126
+ rspec-core (3.0.3)
127
+ rspec-support (~> 3.0.0)
128
+ rspec-expectations (3.0.3)
129
+ diff-lcs (>= 1.2.0, < 2.0)
130
+ rspec-support (~> 3.0.0)
131
+ rspec-mocks (3.0.3)
132
+ rspec-support (~> 3.0.0)
133
+ rspec-rails (3.0.2)
132
134
  actionpack (>= 3.0)
133
135
  activesupport (>= 3.0)
134
136
  railties (>= 3.0)
135
- rspec-core (~> 2.14.0)
136
- rspec-expectations (~> 2.14.0)
137
- rspec-mocks (~> 2.14.0)
138
- sass (3.2.12)
139
- sass-rails (4.0.0)
140
- railties (>= 4.0.0.beta, < 5.0)
141
- sass (>= 3.1.10)
142
- sprockets-rails (~> 2.0.0)
137
+ rspec-core (~> 3.0.0)
138
+ rspec-expectations (~> 3.0.0)
139
+ rspec-mocks (~> 3.0.0)
140
+ rspec-support (~> 3.0.0)
141
+ rspec-support (3.0.3)
142
+ sass (3.2.19)
143
+ sass-rails (4.0.3)
144
+ railties (>= 4.0.0, < 5.0)
145
+ sass (~> 3.2.0)
146
+ sprockets (~> 2.8, <= 2.11.0)
147
+ sprockets-rails (~> 2.0)
143
148
  sdoc (0.4.0)
144
149
  json (~> 1.8)
145
150
  rdoc (~> 4.0, < 5.0)
@@ -148,7 +153,7 @@ GEM
148
153
  spring (1.1.3)
149
154
  spring-commands-rspec (1.0.2)
150
155
  spring (>= 0.9.1)
151
- sprockets (2.10.1)
156
+ sprockets (2.11.0)
152
157
  hike (~> 1.2)
153
158
  multi_json (~> 1.0)
154
159
  rack (~> 1.0)
@@ -158,16 +163,15 @@ GEM
158
163
  activesupport (>= 3.0)
159
164
  sprockets (~> 2.8)
160
165
  sqlite3 (1.3.8)
161
- thor (0.18.1)
162
- thread_safe (0.1.3)
163
- atomic
166
+ thor (0.19.1)
167
+ thread_safe (0.3.4)
164
168
  tilt (1.4.1)
165
169
  treetop (1.4.15)
166
170
  polyglot
167
171
  polyglot (>= 0.3.1)
168
172
  turbolinks (2.2.2)
169
173
  coffee-rails
170
- tzinfo (0.3.38)
174
+ tzinfo (0.3.41)
171
175
  uglifier (2.5.0)
172
176
  execjs (>= 0.3.0)
173
177
  json (>= 1.8.0)
@@ -199,7 +203,7 @@ DEPENDENCIES
199
203
  rails (= 4.0.0)
200
204
  rake (>= 0.9.2)
201
205
  redcarpet
202
- rspec-rails (>= 2.13.1, < 3)
206
+ rspec-rails (~> 3.0.1)
203
207
  sass-rails (~> 4.0.0)
204
208
  sdoc
205
209
  shoulda-context (~> 1.2.0)
@@ -9,7 +9,6 @@ gem "bundler", "~> 1.1"
9
9
  gem "cucumber", "~> 1.1"
10
10
  gem "pry"
11
11
  gem "rake", ">= 0.9.2"
12
- gem "rspec-rails", ">= 2.13.1", "< 3"
13
12
  gem "yard"
14
13
  gem "redcarpet"
15
14
  gem "pygments.rb"
@@ -27,12 +26,13 @@ gem "uglifier", ">= 1.3.0"
27
26
  gem "coffee-rails", "~> 4.0.0"
28
27
  gem "jquery-rails"
29
28
  gem "turbolinks"
30
- gem "jbuilder", "~> 1.2"
31
29
  gem "sdoc"
32
30
  gem "activeresource", "4.0.0"
33
31
  gem "protected_attributes"
34
32
  gem "rails", "4.0.1"
33
+ gem "jbuilder", "~> 1.2"
35
34
  gem "sass-rails", "~> 4.0.0"
36
35
  gem "bcrypt-ruby", "~> 3.1.2"
36
+ gem "rspec-rails", "2.99.0"
37
37
 
38
38
  gemspec :path=>".././"
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: ../
3
3
  specs:
4
- shoulda-matchers (2.6.2)
4
+ shoulda-matchers (2.7.0)
5
5
  activesupport (>= 3.0.0)
6
6
 
7
7
  GEM
@@ -40,16 +40,15 @@ GEM
40
40
  rake
41
41
  thor (>= 0.14.0)
42
42
  arel (4.0.1)
43
- aruba (0.5.3)
43
+ aruba (0.6.0)
44
44
  childprocess (>= 0.3.6)
45
45
  cucumber (>= 1.1.1)
46
46
  rspec-expectations (>= 2.7.0)
47
- atomic (1.1.14)
48
47
  bcrypt-ruby (3.1.2)
49
48
  bourne (1.5.0)
50
49
  mocha (>= 0.13.2, < 0.15)
51
50
  builder (3.1.4)
52
- childprocess (0.3.9)
51
+ childprocess (0.5.3)
53
52
  ffi (~> 1.0, >= 1.0.11)
54
53
  coderay (1.1.0)
55
54
  coffee-rails (4.0.1)
@@ -59,12 +58,12 @@ GEM
59
58
  coffee-script-source
60
59
  execjs
61
60
  coffee-script-source (1.7.0)
62
- cucumber (1.3.10)
61
+ cucumber (1.3.16)
63
62
  builder (>= 2.1.2)
64
63
  diff-lcs (>= 1.1.3)
65
64
  gherkin (~> 2.12)
66
65
  multi_json (>= 1.7.5, < 2.0)
67
- multi_test (>= 0.0.2)
66
+ multi_test (>= 0.1.1)
68
67
  diff-lcs (1.2.5)
69
68
  erubis (2.7.0)
70
69
  execjs (2.0.2)
@@ -72,7 +71,7 @@ GEM
72
71
  gherkin (2.12.2)
73
72
  multi_json (~> 1.3)
74
73
  hike (1.2.3)
75
- i18n (0.6.5)
74
+ i18n (0.6.11)
76
75
  jbuilder (1.5.3)
77
76
  activesupport (>= 3.0.0)
78
77
  multi_json (>= 1.2.0)
@@ -89,8 +88,8 @@ GEM
89
88
  minitest (4.7.5)
90
89
  mocha (0.14.0)
91
90
  metaclass (~> 0.0.1)
92
- multi_json (1.8.2)
93
- multi_test (0.0.2)
91
+ multi_json (1.10.1)
92
+ multi_test (0.1.1)
94
93
  polyglot (0.3.3)
95
94
  posix-spawn (0.3.8)
96
95
  protected_attributes (1.0.5)
@@ -120,21 +119,25 @@ GEM
120
119
  activesupport (= 4.0.1)
121
120
  rake (>= 0.8.7)
122
121
  thor (>= 0.18.1, < 2.0)
123
- rake (10.1.1)
122
+ rake (10.3.2)
124
123
  rdoc (4.1.1)
125
124
  json (~> 1.4)
126
125
  redcarpet (3.1.2)
127
- rspec-core (2.14.7)
128
- rspec-expectations (2.14.4)
126
+ rspec-collection_matchers (1.0.0)
127
+ rspec-expectations (>= 2.99.0.beta1)
128
+ rspec-core (2.99.1)
129
+ rspec-expectations (2.99.2)
129
130
  diff-lcs (>= 1.1.3, < 2.0)
130
- rspec-mocks (2.14.4)
131
- rspec-rails (2.14.0)
131
+ rspec-mocks (2.99.2)
132
+ rspec-rails (2.99.0)
132
133
  actionpack (>= 3.0)
134
+ activemodel (>= 3.0)
133
135
  activesupport (>= 3.0)
134
136
  railties (>= 3.0)
135
- rspec-core (~> 2.14.0)
136
- rspec-expectations (~> 2.14.0)
137
- rspec-mocks (~> 2.14.0)
137
+ rspec-collection_matchers
138
+ rspec-core (~> 2.99.0)
139
+ rspec-expectations (~> 2.99.0)
140
+ rspec-mocks (~> 2.99.0)
138
141
  sass (3.2.12)
139
142
  sass-rails (4.0.1)
140
143
  railties (>= 4.0.0, < 5.0)
@@ -158,16 +161,15 @@ GEM
158
161
  activesupport (>= 3.0)
159
162
  sprockets (~> 2.8)
160
163
  sqlite3 (1.3.8)
161
- thor (0.18.1)
162
- thread_safe (0.1.3)
163
- atomic
164
+ thor (0.19.1)
165
+ thread_safe (0.3.4)
164
166
  tilt (1.4.1)
165
167
  treetop (1.4.15)
166
168
  polyglot
167
169
  polyglot (>= 0.3.1)
168
170
  turbolinks (2.2.2)
169
171
  coffee-rails
170
- tzinfo (0.3.38)
172
+ tzinfo (0.3.41)
171
173
  uglifier (2.5.0)
172
174
  execjs (>= 0.3.0)
173
175
  json (>= 1.8.0)
@@ -199,7 +201,7 @@ DEPENDENCIES
199
201
  rails (= 4.0.1)
200
202
  rake (>= 0.9.2)
201
203
  redcarpet
202
- rspec-rails (>= 2.13.1, < 3)
204
+ rspec-rails (= 2.99.0)
203
205
  sass-rails (~> 4.0.0)
204
206
  sdoc
205
207
  shoulda-context (~> 1.2.0)
data/gemfiles/4.1.gemfile CHANGED
@@ -9,7 +9,6 @@ gem "bundler", "~> 1.1"
9
9
  gem "cucumber", "~> 1.1"
10
10
  gem "pry"
11
11
  gem "rake", ">= 0.9.2"
12
- gem "rspec-rails", ">= 2.13.1", "< 3"
13
12
  gem "yard"
14
13
  gem "redcarpet"
15
14
  gem "pygments.rb"
@@ -27,6 +26,7 @@ gem "coffee-rails", "~> 4.0.0"
27
26
  gem "jquery-rails"
28
27
  gem "turbolinks"
29
28
  gem "activeresource", "4.0.0"
29
+ gem "rspec-rails", "~> 3.0.1"
30
30
  gem "rails", "~> 4.1.0"
31
31
  gem "jbuilder", "~> 2.0"
32
32
  gem "sass-rails", "~> 4.0.3"
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .././
3
3
  specs:
4
- shoulda-matchers (2.6.2)
4
+ shoulda-matchers (2.7.0)
5
5
  activesupport (>= 3.0.0)
6
6
 
7
7
  GEM
@@ -42,7 +42,7 @@ GEM
42
42
  rake
43
43
  thor (>= 0.14.0)
44
44
  arel (5.0.0)
45
- aruba (0.5.4)
45
+ aruba (0.6.0)
46
46
  childprocess (>= 0.3.6)
47
47
  cucumber (>= 1.1.1)
48
48
  rspec-expectations (>= 2.7.0)
@@ -50,7 +50,7 @@ GEM
50
50
  bourne (1.5.0)
51
51
  mocha (>= 0.13.2, < 0.15)
52
52
  builder (3.2.2)
53
- childprocess (0.4.0)
53
+ childprocess (0.5.3)
54
54
  ffi (~> 1.0, >= 1.0.11)
55
55
  coderay (1.1.0)
56
56
  coffee-rails (4.0.1)
@@ -60,12 +60,12 @@ GEM
60
60
  coffee-script-source
61
61
  execjs
62
62
  coffee-script-source (1.7.0)
63
- cucumber (1.3.10)
63
+ cucumber (1.3.16)
64
64
  builder (>= 2.1.2)
65
65
  diff-lcs (>= 1.1.3)
66
66
  gherkin (~> 2.12)
67
67
  multi_json (>= 1.7.5, < 2.0)
68
- multi_test (>= 0.0.2)
68
+ multi_test (>= 0.1.1)
69
69
  diff-lcs (1.2.5)
70
70
  erubis (2.7.0)
71
71
  execjs (2.0.2)
@@ -73,7 +73,7 @@ GEM
73
73
  gherkin (2.12.2)
74
74
  multi_json (~> 1.3)
75
75
  hike (1.2.3)
76
- i18n (0.6.9)
76
+ i18n (0.6.11)
77
77
  jbuilder (2.0.6)
78
78
  activesupport (>= 3.0.0, < 5)
79
79
  multi_json (~> 1.2)
@@ -87,11 +87,11 @@ GEM
87
87
  metaclass (0.0.2)
88
88
  method_source (0.8.2)
89
89
  mime-types (1.25.1)
90
- minitest (5.3.2)
90
+ minitest (5.4.0)
91
91
  mocha (0.14.0)
92
92
  metaclass (~> 0.0.1)
93
- multi_json (1.9.2)
94
- multi_test (0.0.3)
93
+ multi_json (1.10.1)
94
+ multi_test (0.1.1)
95
95
  polyglot (0.3.4)
96
96
  posix-spawn (0.3.8)
97
97
  protected_attributes (1.0.7)
@@ -123,22 +123,26 @@ GEM
123
123
  activesupport (= 4.1.0)
124
124
  rake (>= 0.8.7)
125
125
  thor (>= 0.18.1, < 2.0)
126
- rake (10.2.2)
126
+ rake (10.3.2)
127
127
  rdoc (4.1.1)
128
128
  json (~> 1.4)
129
129
  redcarpet (3.1.2)
130
- rspec-core (2.14.7)
131
- rspec-expectations (2.14.4)
132
- diff-lcs (>= 1.1.3, < 2.0)
133
- rspec-mocks (2.14.4)
134
- rspec-rails (2.14.1)
130
+ rspec-core (3.0.3)
131
+ rspec-support (~> 3.0.0)
132
+ rspec-expectations (3.0.3)
133
+ diff-lcs (>= 1.2.0, < 2.0)
134
+ rspec-support (~> 3.0.0)
135
+ rspec-mocks (3.0.3)
136
+ rspec-support (~> 3.0.0)
137
+ rspec-rails (3.0.2)
135
138
  actionpack (>= 3.0)
136
- activemodel (>= 3.0)
137
139
  activesupport (>= 3.0)
138
140
  railties (>= 3.0)
139
- rspec-core (~> 2.14.0)
140
- rspec-expectations (~> 2.14.0)
141
- rspec-mocks (~> 2.14.0)
141
+ rspec-core (~> 3.0.0)
142
+ rspec-expectations (~> 3.0.0)
143
+ rspec-mocks (~> 3.0.0)
144
+ rspec-support (~> 3.0.0)
145
+ rspec-support (3.0.3)
142
146
  sass (3.2.19)
143
147
  sass-rails (4.0.3)
144
148
  railties (>= 4.0.0, < 5.0)
@@ -164,14 +168,14 @@ GEM
164
168
  sprockets (~> 2.8)
165
169
  sqlite3 (1.3.9)
166
170
  thor (0.19.1)
167
- thread_safe (0.3.3)
171
+ thread_safe (0.3.4)
168
172
  tilt (1.4.1)
169
173
  treetop (1.4.15)
170
174
  polyglot
171
175
  polyglot (>= 0.3.1)
172
176
  turbolinks (2.2.2)
173
177
  coffee-rails
174
- tzinfo (1.1.0)
178
+ tzinfo (1.2.2)
175
179
  thread_safe (~> 0.1)
176
180
  uglifier (2.5.0)
177
181
  execjs (>= 0.3.0)
@@ -204,7 +208,7 @@ DEPENDENCIES
204
208
  rails (~> 4.1.0)
205
209
  rake (>= 0.9.2)
206
210
  redcarpet
207
- rspec-rails (>= 2.13.1, < 3)
211
+ rspec-rails (~> 3.0.1)
208
212
  sass-rails (~> 4.0.3)
209
213
  sdoc (~> 0.4.0)
210
214
  shoulda-context (~> 1.2.0)