shoulda-matchers 2.6.2 → 2.7.0

Sign up to get free protection for your applications and to get access to all the features.
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
data/gemfiles/3.0.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"
@@ -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.0.17"
26
26
 
27
27
  gemspec :path=>".././"
data/gemfiles/3.0.gemfile.lock CHANGED
@@ -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,29 +39,30 @@ GEM
39
39
  rake
40
40
  thor (>= 0.14.0)
41
41
  arel (2.0.10)
42
- aruba (0.5.1)
43
- childprocess (~> 0.3.6)
42
+ aruba (0.6.0)
43
+ childprocess (>= 0.3.6)
44
44
  cucumber (>= 1.1.1)
45
45
  rspec-expectations (>= 2.7.0)
46
46
  bourne (1.4.0)
47
47
  mocha (~> 0.13.2)
48
48
  builder (2.1.2)
49
- childprocess (0.3.9)
49
+ childprocess (0.5.3)
50
50
  ffi (~> 1.0, >= 1.0.11)
51
51
  coderay (1.1.0)
52
- cucumber (1.2.3)
52
+ cucumber (1.3.16)
53
53
  builder (>= 2.1.2)
54
54
  diff-lcs (>= 1.1.3)
55
- gherkin (~> 2.11.6)
56
- multi_json (~> 1.3)
57
- diff-lcs (1.2.1)
55
+ gherkin (~> 2.12)
56
+ multi_json (>= 1.7.5, < 2.0)
57
+ multi_test (>= 0.1.1)
58
+ diff-lcs (1.2.5)
58
59
  erubis (2.6.6)
59
60
  abstract (>= 1.0.0)
60
- ffi (1.4.0)
61
- gherkin (2.11.6)
62
- json (>= 1.7.6)
63
- i18n (0.5.0)
64
- json (1.7.7)
61
+ ffi (1.9.3)
62
+ gherkin (2.12.2)
63
+ multi_json (~> 1.3)
64
+ i18n (0.5.4)
65
+ json (1.8.1)
65
66
  mail (2.2.19)
66
67
  activesupport (>= 2.3.6)
67
68
  i18n (>= 0.4.0)
@@ -72,7 +73,8 @@ GEM
72
73
  mime-types (1.21)
73
74
  mocha (0.13.3)
74
75
  metaclass (~> 0.0.1)
75
- multi_json (1.7.1)
76
+ multi_json (1.10.1)
77
+ multi_test (0.1.1)
76
78
  polyglot (0.3.3)
77
79
  posix-spawn (0.3.8)
78
80
  pry (0.9.12.6)
@@ -101,21 +103,25 @@ GEM
101
103
  rake (>= 0.8.7)
102
104
  rdoc (~> 3.4)
103
105
  thor (~> 0.14.4)
104
- rake (10.0.3)
106
+ rake (10.3.2)
105
107
  rdoc (3.12.2)
106
108
  json (~> 1.4)
107
109
  redcarpet (3.1.2)
108
- rspec-core (2.13.1)
109
- rspec-expectations (2.13.0)
110
+ rspec-collection_matchers (1.0.0)
111
+ rspec-expectations (>= 2.99.0.beta1)
112
+ rspec-core (2.99.1)
113
+ rspec-expectations (2.99.2)
110
114
  diff-lcs (>= 1.1.3, < 2.0)
111
- rspec-mocks (2.13.1)
112
- rspec-rails (2.13.2)
115
+ rspec-mocks (2.99.2)
116
+ rspec-rails (2.99.0)
113
117
  actionpack (>= 3.0)
118
+ activemodel (>= 3.0)
114
119
  activesupport (>= 3.0)
115
120
  railties (>= 3.0)
116
- rspec-core (~> 2.13.0)
117
- rspec-expectations (~> 2.13.0)
118
- rspec-mocks (~> 2.13.0)
121
+ rspec-collection_matchers
122
+ rspec-core (~> 2.99.0)
123
+ rspec-expectations (~> 2.99.0)
124
+ rspec-mocks (~> 2.99.0)
119
125
  shoulda-context (1.2.0)
120
126
  slop (3.4.7)
121
127
  sqlite3 (1.3.7)
@@ -127,7 +133,7 @@ GEM
127
133
  treetop (1.4.12)
128
134
  polyglot
129
135
  polyglot (>= 0.3.1)
130
- tzinfo (0.3.37)
136
+ tzinfo (0.3.41)
131
137
  watchr (0.7)
132
138
  yajl-ruby (1.1.0)
133
139
  yard (0.8.7.3)
@@ -150,7 +156,7 @@ DEPENDENCIES
150
156
  rails (~> 3.0.17)
151
157
  rake (>= 0.9.2)
152
158
  redcarpet
153
- rspec-rails (>= 2.13.1, < 3)
159
+ rspec-rails (= 2.99.0)
154
160
  shoulda-context (~> 1.2.0)
155
161
  shoulda-matchers!
156
162
  sqlite3
data/gemfiles/3.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"
@@ -28,6 +27,7 @@ gem "jquery-rails"
28
27
  gem "sass-rails", "~> 3.1.5"
29
28
  gem "coffee-rails", "~> 3.1.1"
30
29
  gem "uglifier", ">= 1.0.3"
30
+ gem "rspec-rails", "2.99.0"
31
31
  gem "turn", "~> 0.8.3"
32
32
 
33
33
  gemspec :path=>".././"
data/gemfiles/3.1.gemfile.lock CHANGED
@@ -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
@@ -41,15 +41,15 @@ GEM
41
41
  rake
42
42
  thor (>= 0.14.0)
43
43
  arel (2.2.3)
44
- aruba (0.5.1)
45
- childprocess (~> 0.3.6)
44
+ aruba (0.6.0)
45
+ childprocess (>= 0.3.6)
46
46
  cucumber (>= 1.1.1)
47
47
  rspec-expectations (>= 2.7.0)
48
48
  bcrypt-ruby (3.0.1)
49
49
  bourne (1.4.0)
50
50
  mocha (~> 0.13.2)
51
51
  builder (3.0.4)
52
- childprocess (0.3.9)
52
+ childprocess (0.5.3)
53
53
  ffi (~> 1.0, >= 1.0.11)
54
54
  coderay (1.1.0)
55
55
  coffee-rails (3.1.1)
@@ -59,23 +59,24 @@ GEM
59
59
  coffee-script-source
60
60
  execjs
61
61
  coffee-script-source (1.7.0)
62
- cucumber (1.2.3)
62
+ cucumber (1.3.16)
63
63
  builder (>= 2.1.2)
64
64
  diff-lcs (>= 1.1.3)
65
- gherkin (~> 2.11.6)
66
- multi_json (~> 1.3)
67
- diff-lcs (1.2.1)
65
+ gherkin (~> 2.12)
66
+ multi_json (>= 1.7.5, < 2.0)
67
+ multi_test (>= 0.1.1)
68
+ diff-lcs (1.2.5)
68
69
  erubis (2.7.0)
69
70
  execjs (2.0.2)
70
- ffi (1.4.0)
71
- gherkin (2.11.6)
72
- json (>= 1.7.6)
73
- hike (1.2.1)
74
- i18n (0.6.4)
71
+ ffi (1.9.3)
72
+ gherkin (2.12.2)
73
+ multi_json (~> 1.3)
74
+ hike (1.2.3)
75
+ i18n (0.6.11)
75
76
  jquery-rails (2.2.1)
76
77
  railties (>= 3.0, < 5.0)
77
78
  thor (>= 0.14, < 2.0)
78
- json (1.7.7)
79
+ json (1.8.1)
79
80
  mail (2.3.3)
80
81
  i18n (>= 0.4.0)
81
82
  mime-types (~> 1.16)
@@ -85,7 +86,8 @@ GEM
85
86
  mime-types (1.21)
86
87
  mocha (0.13.3)
87
88
  metaclass (~> 0.0.1)
88
- multi_json (1.7.1)
89
+ multi_json (1.10.1)
90
+ multi_test (0.1.1)
89
91
  polyglot (0.3.3)
90
92
  posix-spawn (0.3.8)
91
93
  pry (0.9.12.6)
@@ -100,7 +102,7 @@ GEM
100
102
  rack (>= 0.4)
101
103
  rack-mount (0.8.3)
102
104
  rack (>= 1.0.0)
103
- rack-ssl (1.3.3)
105
+ rack-ssl (1.3.4)
104
106
  rack
105
107
  rack-test (0.6.2)
106
108
  rack (>= 1.0)
@@ -119,21 +121,25 @@ GEM
119
121
  rake (>= 0.8.7)
120
122
  rdoc (~> 3.4)
121
123
  thor (~> 0.14.6)
122
- rake (10.0.3)
124
+ rake (10.3.2)
123
125
  rdoc (3.12.2)
124
126
  json (~> 1.4)
125
127
  redcarpet (3.1.2)
126
- rspec-core (2.13.1)
127
- rspec-expectations (2.13.0)
128
+ rspec-collection_matchers (1.0.0)
129
+ rspec-expectations (>= 2.99.0.beta1)
130
+ rspec-core (2.99.1)
131
+ rspec-expectations (2.99.2)
128
132
  diff-lcs (>= 1.1.3, < 2.0)
129
- rspec-mocks (2.13.1)
130
- rspec-rails (2.13.2)
133
+ rspec-mocks (2.99.2)
134
+ rspec-rails (2.99.0)
131
135
  actionpack (>= 3.0)
136
+ activemodel (>= 3.0)
132
137
  activesupport (>= 3.0)
133
138
  railties (>= 3.0)
134
- rspec-core (~> 2.13.0)
135
- rspec-expectations (~> 2.13.0)
136
- rspec-mocks (~> 2.13.0)
139
+ rspec-collection_matchers
140
+ rspec-core (~> 2.99.0)
141
+ rspec-expectations (~> 2.99.0)
142
+ rspec-mocks (~> 2.99.0)
137
143
  sass (3.2.7)
138
144
  sass-rails (3.1.6)
139
145
  actionpack (~> 3.1.0)
@@ -152,7 +158,7 @@ GEM
152
158
  activemodel (~> 3.0)
153
159
  railties (~> 3.0)
154
160
  thor (0.14.6)
155
- tilt (1.3.6)
161
+ tilt (1.3.7)
156
162
  treetop (1.4.12)
157
163
  polyglot
158
164
  polyglot (>= 0.3.1)
@@ -187,7 +193,7 @@ DEPENDENCIES
187
193
  rails (~> 3.1.8)
188
194
  rake (>= 0.9.2)
189
195
  redcarpet
190
- rspec-rails (>= 2.13.1, < 3)
196
+ rspec-rails (= 2.99.0)
191
197
  sass-rails (~> 3.1.5)
192
198
  shoulda-context (~> 1.2.0)
193
199
  shoulda-matchers!
data/gemfiles/3.1_1.9.2.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"
@@ -28,6 +27,7 @@ gem "jquery-rails"
28
27
  gem "sass-rails", "~> 3.1.5"
29
28
  gem "coffee-rails", "~> 3.1.1"
30
29
  gem "uglifier", ">= 1.0.3"
30
+ gem "rspec-rails", "2.99.0"
31
31
  gem "turn", "0.8.2"
32
32
 
33
33
  gemspec :path=>".././"
data/gemfiles/3.1_1.9.2.gemfile.lock CHANGED
@@ -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
@@ -41,7 +41,7 @@ GEM
41
41
  rake
42
42
  thor (>= 0.14.0)
43
43
  arel (2.2.3)
44
- aruba (0.5.3)
44
+ aruba (0.6.0)
45
45
  childprocess (>= 0.3.6)
46
46
  cucumber (>= 1.1.1)
47
47
  rspec-expectations (>= 2.7.0)
@@ -49,7 +49,7 @@ GEM
49
49
  bourne (1.5.0)
50
50
  mocha (>= 0.13.2, < 0.15)
51
51
  builder (3.0.4)
52
- childprocess (0.3.9)
52
+ childprocess (0.5.3)
53
53
  ffi (~> 1.0, >= 1.0.11)
54
54
  coderay (1.1.0)
55
55
  coffee-rails (3.1.1)
@@ -59,12 +59,12 @@ GEM
59
59
  coffee-script-source
60
60
  execjs
61
61
  coffee-script-source (1.7.0)
62
- cucumber (1.3.10)
62
+ cucumber (1.3.16)
63
63
  builder (>= 2.1.2)
64
64
  diff-lcs (>= 1.1.3)
65
65
  gherkin (~> 2.12)
66
66
  multi_json (>= 1.7.5, < 2.0)
67
- multi_test (>= 0.0.2)
67
+ multi_test (>= 0.1.1)
68
68
  diff-lcs (1.2.5)
69
69
  erubis (2.7.0)
70
70
  execjs (2.0.2)
@@ -72,7 +72,7 @@ GEM
72
72
  gherkin (2.12.2)
73
73
  multi_json (~> 1.3)
74
74
  hike (1.2.3)
75
- i18n (0.6.9)
75
+ i18n (0.6.11)
76
76
  jquery-rails (2.2.1)
77
77
  railties (>= 3.0, < 5.0)
78
78
  thor (>= 0.14, < 2.0)
@@ -86,8 +86,8 @@ GEM
86
86
  mime-types (1.25.1)
87
87
  mocha (0.14.0)
88
88
  metaclass (~> 0.0.1)
89
- multi_json (1.8.4)
90
- multi_test (0.0.3)
89
+ multi_json (1.10.1)
90
+ multi_test (0.1.1)
91
91
  polyglot (0.3.3)
92
92
  posix-spawn (0.3.8)
93
93
  pry (0.9.12.6)
@@ -102,7 +102,7 @@ GEM
102
102
  rack (>= 0.4)
103
103
  rack-mount (0.8.3)
104
104
  rack (>= 1.0.0)
105
- rack-ssl (1.3.3)
105
+ rack-ssl (1.3.4)
106
106
  rack
107
107
  rack-test (0.6.2)
108
108
  rack (>= 1.0)
@@ -121,22 +121,25 @@ GEM
121
121
  rake (>= 0.8.7)
122
122
  rdoc (~> 3.4)
123
123
  thor (~> 0.14.6)
124
- rake (10.1.1)
124
+ rake (10.3.2)
125
125
  rdoc (3.12.2)
126
126
  json (~> 1.4)
127
127
  redcarpet (3.1.2)
128
- rspec-core (2.14.7)
129
- rspec-expectations (2.14.4)
128
+ rspec-collection_matchers (1.0.0)
129
+ rspec-expectations (>= 2.99.0.beta1)
130
+ rspec-core (2.99.1)
131
+ rspec-expectations (2.99.2)
130
132
  diff-lcs (>= 1.1.3, < 2.0)
131
- rspec-mocks (2.14.4)
132
- rspec-rails (2.14.1)
133
+ rspec-mocks (2.99.2)
134
+ rspec-rails (2.99.0)
133
135
  actionpack (>= 3.0)
134
136
  activemodel (>= 3.0)
135
137
  activesupport (>= 3.0)
136
138
  railties (>= 3.0)
137
- rspec-core (~> 2.14.0)
138
- rspec-expectations (~> 2.14.0)
139
- rspec-mocks (~> 2.14.0)
139
+ rspec-collection_matchers
140
+ rspec-core (~> 2.99.0)
141
+ rspec-expectations (~> 2.99.0)
142
+ rspec-mocks (~> 2.99.0)
140
143
  sass (3.2.12)
141
144
  sass-rails (3.1.6)
142
145
  actionpack (~> 3.1.0)
@@ -155,7 +158,7 @@ GEM
155
158
  activemodel (~> 3.0)
156
159
  railties (~> 3.0)
157
160
  thor (0.14.6)
158
- tilt (1.3.6)
161
+ tilt (1.3.7)
159
162
  treetop (1.4.15)
160
163
  polyglot
161
164
  polyglot (>= 0.3.1)
@@ -190,7 +193,7 @@ DEPENDENCIES
190
193
  rails (~> 3.1.8)
191
194
  rake (>= 0.9.2)
192
195
  redcarpet
193
- rspec-rails (>= 2.13.1, < 3)
196
+ rspec-rails (= 2.99.0)
194
197
  sass-rails (~> 3.1.5)
195
198
  shoulda-context (~> 1.2.0)
196
199
  shoulda-matchers!
data/gemfiles/3.2.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"
@@ -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"
data/gemfiles/3.2.gemfile.lock CHANGED
@@ -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,15 +39,15 @@ GEM
39
39
  rake
40
40
  thor (>= 0.14.0)
41
41
  arel (3.0.2)
42
- aruba (0.5.1)
43
- childprocess (~> 0.3.6)
42
+ aruba (0.6.0)
43
+ childprocess (>= 0.3.6)
44
44
  cucumber (>= 1.1.1)
45
45
  rspec-expectations (>= 2.7.0)
46
46
  bcrypt-ruby (3.0.1)
47
47
  bourne (1.4.0)
48
48
  mocha (~> 0.13.2)
49
49
  builder (3.0.4)
50
- childprocess (0.3.9)
50
+ childprocess (0.5.3)
51
51
  ffi (~> 1.0, >= 1.0.11)
52
52
  coderay (1.1.0)
53
53
  coffee-rails (3.2.2)
@@ -57,24 +57,25 @@ GEM
57
57
  coffee-script-source
58
58
  execjs
59
59
  coffee-script-source (1.7.0)
60
- cucumber (1.2.3)
60
+ cucumber (1.3.16)
61
61
  builder (>= 2.1.2)
62
62
  diff-lcs (>= 1.1.3)
63
- gherkin (~> 2.11.6)
64
- multi_json (~> 1.3)
65
- diff-lcs (1.2.1)
63
+ gherkin (~> 2.12)
64
+ multi_json (>= 1.7.5, < 2.0)
65
+ multi_test (>= 0.1.1)
66
+ diff-lcs (1.2.5)
66
67
  erubis (2.7.0)
67
68
  execjs (2.0.2)
68
- ffi (1.4.0)
69
- gherkin (2.11.6)
70
- json (>= 1.7.6)
71
- hike (1.2.1)
69
+ ffi (1.9.3)
70
+ gherkin (2.12.2)
71
+ multi_json (~> 1.3)
72
+ hike (1.2.3)
72
73
  i18n (0.6.1)
73
74
  journey (1.0.4)
74
75
  jquery-rails (2.2.1)
75
76
  railties (>= 3.0, < 5.0)
76
77
  thor (>= 0.14, < 2.0)
77
- json (1.7.7)
78
+ json (1.8.1)
78
79
  mail (2.5.3)
79
80
  i18n (>= 0.4.0)
80
81
  mime-types (~> 1.16)
@@ -84,7 +85,8 @@ GEM
84
85
  mime-types (1.21)
85
86
  mocha (0.13.3)
86
87
  metaclass (~> 0.0.1)
87
- multi_json (1.7.1)
88
+ multi_json (1.10.1)
89
+ multi_test (0.1.1)
88
90
  polyglot (0.3.3)
89
91
  posix-spawn (0.3.8)
90
92
  pry (0.9.12.6)
@@ -97,7 +99,7 @@ GEM
97
99
  rack (1.4.5)
98
100
  rack-cache (1.2)
99
101
  rack (>= 0.4)
100
- rack-ssl (1.3.3)
102
+ rack-ssl (1.3.4)
101
103
  rack
102
104
  rack-test (0.6.2)
103
105
  rack (>= 1.0)
@@ -116,21 +118,25 @@ GEM
116
118
  rake (>= 0.8.7)
117
119
  rdoc (~> 3.4)
118
120
  thor (>= 0.14.6, < 2.0)
119
- rake (10.1.1)
121
+ rake (10.3.2)
120
122
  rdoc (3.12.2)
121
123
  json (~> 1.4)
122
124
  redcarpet (3.1.2)
123
- rspec-core (2.13.1)
124
- rspec-expectations (2.13.0)
125
+ rspec-collection_matchers (1.0.0)
126
+ rspec-expectations (>= 2.99.0.beta1)
127
+ rspec-core (2.99.1)
128
+ rspec-expectations (2.99.2)
125
129
  diff-lcs (>= 1.1.3, < 2.0)
126
- rspec-mocks (2.13.1)
127
- rspec-rails (2.13.2)
130
+ rspec-mocks (2.99.2)
131
+ rspec-rails (2.99.0)
128
132
  actionpack (>= 3.0)
133
+ activemodel (>= 3.0)
129
134
  activesupport (>= 3.0)
130
135
  railties (>= 3.0)
131
- rspec-core (~> 2.13.0)
132
- rspec-expectations (~> 2.13.0)
133
- rspec-mocks (~> 2.13.0)
136
+ rspec-collection_matchers
137
+ rspec-core (~> 2.99.0)
138
+ rspec-expectations (~> 2.99.0)
139
+ rspec-mocks (~> 2.99.0)
134
140
  sass (3.2.7)
135
141
  sass-rails (3.2.6)
136
142
  railties (~> 3.2.0)
@@ -151,8 +157,8 @@ GEM
151
157
  actionpack (~> 3.0)
152
158
  activemodel (~> 3.0)
153
159
  railties (~> 3.0)
154
- thor (0.18.1)
155
- tilt (1.3.6)
160
+ thor (0.19.1)
161
+ tilt (1.4.1)
156
162
  treetop (1.4.12)
157
163
  polyglot
158
164
  polyglot (>= 0.3.1)
@@ -185,7 +191,7 @@ DEPENDENCIES
185
191
  rails (~> 3.2.13)
186
192
  rake (>= 0.9.2)
187
193
  redcarpet
188
- rspec-rails (>= 2.13.1, < 3)
194
+ rspec-rails (= 2.99.0)
189
195
  sass-rails (~> 3.2.3)
190
196
  shoulda-context (~> 1.2.0)
191
197
  shoulda-matchers!