rspec-rails 2.5.0 → 2.6.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 (90) hide show
  1. data/.gitignore +10 -5
  2. data/.rspec +1 -0
  3. data/.travis.yml +10 -0
  4. data/README.md +2 -0
  5. data/README_DEV.md +43 -0
  6. data/Rakefile +72 -31
  7. data/Thorfile +33 -18
  8. data/features/.nav +2 -0
  9. data/features/Autotest.md +7 -0
  10. data/features/Changelog.md +26 -2
  11. data/features/Generators.md +1 -1
  12. data/features/GettingStarted.md +45 -1
  13. data/features/Upgrade.md +13 -12
  14. data/features/controller_specs/README.md +18 -10
  15. data/features/controller_specs/anonymous_controller.feature +5 -5
  16. data/features/controller_specs/controller_spec.feature +1 -2
  17. data/features/controller_specs/isolation_from_views.feature +49 -3
  18. data/features/controller_specs/render_views.feature +3 -3
  19. data/features/helper_specs/helper_spec.feature +3 -3
  20. data/features/mailer_specs/url_helpers.feature +2 -2
  21. data/features/matchers/new_record_matcher.feature +1 -43
  22. data/features/matchers/redirect_to_matcher.feature +3 -3
  23. data/features/matchers/render_template_matcher.feature +12 -9
  24. data/features/mocks/mock_model.feature +21 -5
  25. data/features/mocks/stub_model.feature +2 -2
  26. data/features/model_specs/errors_on.feature +1 -1
  27. data/features/model_specs/transactional_examples.feature +10 -5
  28. data/features/request_specs/request_spec.feature +49 -0
  29. data/features/routing_specs/README.md +2 -1
  30. data/features/routing_specs/be_routable_matcher.feature +5 -5
  31. data/features/routing_specs/named_routes.feature +1 -1
  32. data/features/routing_specs/route_to_matcher.feature +28 -8
  33. data/features/step_definitions/additional_cli_steps.rb +1 -1
  34. data/features/support/env.rb +7 -19
  35. data/features/view_specs/inferred_controller_path.feature +3 -3
  36. data/features/view_specs/stub_template.feature +2 -2
  37. data/features/view_specs/view_spec.feature +16 -35
  38. data/gemfiles/.bundle/config +2 -0
  39. data/gemfiles/base.rb +58 -0
  40. data/gemfiles/rails-3-0-stable +6 -0
  41. data/gemfiles/rails-3.0.0 +5 -0
  42. data/gemfiles/rails-3.0.1 +5 -0
  43. data/gemfiles/rails-3.0.2 +5 -0
  44. data/gemfiles/rails-3.0.3 +5 -0
  45. data/gemfiles/rails-3.0.4 +5 -0
  46. data/gemfiles/rails-3.0.5 +5 -0
  47. data/gemfiles/rails-3.0.6 +5 -0
  48. data/gemfiles/rails-3.0.7 +5 -0
  49. data/gemfiles/rails-3.1.0.beta1 +5 -0
  50. data/gemfiles/rails-master +7 -0
  51. data/lib/generators/rspec/scaffold/scaffold_generator.rb +20 -2
  52. data/lib/generators/rspec/scaffold/templates/controller_spec.rb +86 -54
  53. data/lib/generators/rspec/scaffold/templates/edit_spec.rb +7 -7
  54. data/lib/generators/rspec/scaffold/templates/index_spec.rb +2 -2
  55. data/lib/generators/rspec/scaffold/templates/new_spec.rb +5 -5
  56. data/lib/generators/rspec/scaffold/templates/routing_spec.rb +14 -14
  57. data/lib/generators/rspec/scaffold/templates/show_spec.rb +2 -2
  58. data/lib/rspec/rails/example/controller_example_group.rb +12 -22
  59. data/lib/rspec/rails/example/helper_example_group.rb +0 -5
  60. data/lib/rspec/rails/example/mailer_example_group.rb +0 -9
  61. data/lib/rspec/rails/example/request_example_group.rb +0 -25
  62. data/lib/rspec/rails/example/routing_example_group.rb +1 -0
  63. data/lib/rspec/rails/example/view_example_group.rb +7 -6
  64. data/lib/rspec/rails/matchers/routing_matchers.rb +23 -2
  65. data/lib/rspec/rails/mocks.rb +3 -0
  66. data/lib/rspec/rails/tasks/rspec.rake +1 -1
  67. data/lib/rspec/rails/vendor/capybara.rb +29 -0
  68. data/lib/rspec/rails/vendor/webrat.rb +33 -0
  69. data/lib/rspec/rails/version.rb +1 -1
  70. data/lib/rspec/rails/view_rendering.rb +24 -8
  71. data/lib/rspec/rails.rb +2 -2
  72. data/rspec-rails.gemspec +5 -36
  73. data/spec/autotest/rails_rspec2_spec.rb +2 -7
  74. data/spec/rspec/rails/example/controller_example_group_spec.rb +25 -0
  75. data/spec/rspec/rails/matchers/route_to_spec.rb +15 -0
  76. data/spec/rspec/rails/mocks/ar_classes.rb +5 -2
  77. data/spec/rspec/rails/view_rendering_spec.rb +0 -6
  78. data/spec/spec_helper.rb +0 -22
  79. data/spec/support/matchers.rb +9 -0
  80. data/templates/generate_stuff.rb +9 -1
  81. data/templates/run_specs.rb +2 -2
  82. metadata +44 -65
  83. data/Gemfile-3-0-stable +0 -6
  84. data/Gemfile-3.0.0 +0 -3
  85. data/Gemfile-3.0.3 +0 -3
  86. data/Gemfile-base +0 -38
  87. data/Gemfile-master +0 -5
  88. data/lib/rspec/rails/browser_simulators.rb +0 -30
  89. data/specs.watchr +0 -59
  90. data/templates/Gemfile-base +0 -17
@@ -1,4 +1,4 @@
1
- run('bundle exec rspec spec -cfdoc')
1
+ run('rspec spec -cfdoc')
2
2
  run('rake spec')
3
3
  run('rake spec:requests')
4
4
  run('rake spec:models')
@@ -6,4 +6,4 @@ run('rake spec:views')
6
6
  run('rake spec:controllers')
7
7
  run('rake spec:helpers')
8
8
  run('rake spec:mailers')
9
- run('rake stats')
9
+ run("rake stats")
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rspec-rails
3
3
  version: !ruby/object:Gem::Version
4
- hash: 27
5
- prerelease: false
4
+ hash: 23
5
+ prerelease:
6
6
  segments:
7
7
  - 2
8
- - 5
8
+ - 6
9
9
  - 0
10
- version: 2.5.0
10
+ version: 2.6.0
11
11
  platform: ruby
12
12
  authors:
13
13
  - David Chelimsky
@@ -15,11 +15,11 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-02-05 00:00:00 -06:00
18
+ date: 2011-05-12 00:00:00 -05:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
- requirement: &id001 !ruby/object:Gem::Requirement
22
+ version_requirements: &id001 !ruby/object:Gem::Requirement
23
23
  none: false
24
24
  requirements:
25
25
  - - ~>
@@ -29,12 +29,12 @@ dependencies:
29
29
  - 3
30
30
  - 0
31
31
  version: "3.0"
32
+ prerelease: false
32
33
  type: :runtime
34
+ requirement: *id001
33
35
  name: activesupport
34
- prerelease: false
35
- version_requirements: *id001
36
36
  - !ruby/object:Gem::Dependency
37
- requirement: &id002 !ruby/object:Gem::Requirement
37
+ version_requirements: &id002 !ruby/object:Gem::Requirement
38
38
  none: false
39
39
  requirements:
40
40
  - - ~>
@@ -44,12 +44,12 @@ dependencies:
44
44
  - 3
45
45
  - 0
46
46
  version: "3.0"
47
+ prerelease: false
47
48
  type: :runtime
49
+ requirement: *id002
48
50
  name: actionpack
49
- prerelease: false
50
- version_requirements: *id002
51
51
  - !ruby/object:Gem::Dependency
52
- requirement: &id003 !ruby/object:Gem::Requirement
52
+ version_requirements: &id003 !ruby/object:Gem::Requirement
53
53
  none: false
54
54
  requirements:
55
55
  - - ~>
@@ -59,26 +59,26 @@ dependencies:
59
59
  - 3
60
60
  - 0
61
61
  version: "3.0"
62
+ prerelease: false
62
63
  type: :runtime
64
+ requirement: *id003
63
65
  name: railties
64
- prerelease: false
65
- version_requirements: *id003
66
66
  - !ruby/object:Gem::Dependency
67
- requirement: &id004 !ruby/object:Gem::Requirement
67
+ version_requirements: &id004 !ruby/object:Gem::Requirement
68
68
  none: false
69
69
  requirements:
70
70
  - - ~>
71
71
  - !ruby/object:Gem::Version
72
- hash: 27
72
+ hash: 23
73
73
  segments:
74
74
  - 2
75
- - 5
75
+ - 6
76
76
  - 0
77
- version: 2.5.0
77
+ version: 2.6.0
78
+ prerelease: false
78
79
  type: :runtime
80
+ requirement: *id004
79
81
  name: rspec
80
- prerelease: false
81
- version_requirements: *id004
82
82
  description: RSpec-2 for Rails-3
83
83
  email: dchelimsky@gmail.com
84
84
  executables: []
@@ -91,14 +91,11 @@ files:
91
91
  - .document
92
92
  - .gitignore
93
93
  - .rspec
94
- - Gemfile-3-0-stable
95
- - Gemfile-3.0.0
96
- - Gemfile-3.0.3
97
- - Gemfile-base
98
- - Gemfile-master
94
+ - .travis.yml
99
95
  - History.md
100
96
  - License.txt
101
97
  - README.md
98
+ - README_DEV.md
102
99
  - Rakefile
103
100
  - Thorfile
104
101
  - Upgrade.md
@@ -126,6 +123,7 @@ files:
126
123
  - features/model_specs/README.md
127
124
  - features/model_specs/errors_on.feature
128
125
  - features/model_specs/transactional_examples.feature
126
+ - features/request_specs/request_spec.feature
129
127
  - features/routing_specs/README.md
130
128
  - features/routing_specs/be_routable_matcher.feature
131
129
  - features/routing_specs/named_routes.feature
@@ -136,6 +134,19 @@ files:
136
134
  - features/view_specs/inferred_controller_path.feature
137
135
  - features/view_specs/stub_template.feature
138
136
  - features/view_specs/view_spec.feature
137
+ - gemfiles/.bundle/config
138
+ - gemfiles/base.rb
139
+ - gemfiles/rails-3-0-stable
140
+ - gemfiles/rails-3.0.0
141
+ - gemfiles/rails-3.0.1
142
+ - gemfiles/rails-3.0.2
143
+ - gemfiles/rails-3.0.3
144
+ - gemfiles/rails-3.0.4
145
+ - gemfiles/rails-3.0.5
146
+ - gemfiles/rails-3.0.6
147
+ - gemfiles/rails-3.0.7
148
+ - gemfiles/rails-3.1.0.beta1
149
+ - gemfiles/rails-master
139
150
  - lib/autotest/rails_rspec2.rb
140
151
  - lib/generators/rspec.rb
141
152
  - lib/generators/rspec/controller/controller_generator.rb
@@ -168,7 +179,6 @@ files:
168
179
  - lib/rspec-rails.rb
169
180
  - lib/rspec/rails.rb
170
181
  - lib/rspec/rails/adapters.rb
171
- - lib/rspec/rails/browser_simulators.rb
172
182
  - lib/rspec/rails/example.rb
173
183
  - lib/rspec/rails/example/controller_example_group.rb
174
184
  - lib/rspec/rails/example/helper_example_group.rb
@@ -191,6 +201,8 @@ files:
191
201
  - lib/rspec/rails/mocks.rb
192
202
  - lib/rspec/rails/module_inclusion.rb
193
203
  - lib/rspec/rails/tasks/rspec.rake
204
+ - lib/rspec/rails/vendor/capybara.rb
205
+ - lib/rspec/rails/vendor/webrat.rb
194
206
  - lib/rspec/rails/version.rb
195
207
  - lib/rspec/rails/view_assigns.rb
196
208
  - lib/rspec/rails/view_rendering.rb
@@ -222,49 +234,14 @@ files:
222
234
  - spec/rspec/rails/view_rendering_spec.rb
223
235
  - spec/spec_helper.rb
224
236
  - spec/support/helpers.rb
225
- - specs.watchr
226
- - templates/Gemfile-base
237
+ - spec/support/matchers.rb
227
238
  - templates/generate_stuff.rb
228
239
  - templates/run_specs.rb
229
240
  has_rdoc: true
230
241
  homepage: http://github.com/rspec/rspec-rails
231
242
  licenses: []
232
243
 
233
- post_install_message: |
234
- **************************************************
235
-
236
- Thank you for installing rspec-rails-2.5.0!
237
-
238
- This version of rspec-rails only works with versions of rails >= 3.0.0
239
-
240
- To configure your app to use rspec-rails, add a declaration to your Gemfile.
241
- If you are using Bundler's grouping feature in your Gemfile, be sure to include
242
- rspec-rails in the :development group as well as the :test group so that you
243
- can access its generators and rake tasks.
244
-
245
- group :development, :test do
246
- gem "rspec-rails", ">= 2.5.0"
247
- end
248
-
249
- Be sure to run the following command in each of your Rails apps if you're
250
- upgrading:
251
-
252
- script/rails generate rspec:install
253
-
254
- Even if you've run it before, this ensures that you have the latest updates
255
- to spec/spec_helper.rb and any other support files.
256
-
257
- Beta versions of rspec-rails-2 installed files that are no longer being used,
258
- so please remove these files if you have them:
259
-
260
- lib/tasks/rspec.rake
261
- config/initializers/rspec_generator.rb
262
-
263
- Lastly, be sure to look at Upgrade.markdown to see what might have changed
264
- since the last release.
265
-
266
- **************************************************
267
-
244
+ post_install_message:
268
245
  rdoc_options:
269
246
  - --charset=UTF-8
270
247
  require_paths:
@@ -290,10 +267,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
290
267
  requirements: []
291
268
 
292
269
  rubyforge_project: rspec
293
- rubygems_version: 1.3.7
270
+ rubygems_version: 1.6.2
294
271
  signing_key:
295
272
  specification_version: 3
296
- summary: rspec-rails-2.5.0
273
+ summary: rspec-rails-2.6.0
297
274
  test_files:
298
275
  - features/Autotest.md
299
276
  - features/Changelog.md
@@ -317,6 +294,7 @@ test_files:
317
294
  - features/model_specs/README.md
318
295
  - features/model_specs/errors_on.feature
319
296
  - features/model_specs/transactional_examples.feature
297
+ - features/request_specs/request_spec.feature
320
298
  - features/routing_specs/README.md
321
299
  - features/routing_specs/be_routable_matcher.feature
322
300
  - features/routing_specs/named_routes.feature
@@ -354,3 +332,4 @@ test_files:
354
332
  - spec/rspec/rails/view_rendering_spec.rb
355
333
  - spec/spec_helper.rb
356
334
  - spec/support/helpers.rb
335
+ - spec/support/matchers.rb
data/Gemfile-3-0-stable DELETED
@@ -1,6 +0,0 @@
1
- instance_eval(File.read("./Gemfile-base"))
2
-
3
- gem "rails", :git => "https://github.com/rails/rails.git", :branch => "3-0-stable"
4
- gem "arel", :git => "https://github.com/rails/arel.git"
5
- gem "rack", :git => "git://github.com/rack/rack.git"
6
-
data/Gemfile-3.0.0 DELETED
@@ -1,3 +0,0 @@
1
- instance_eval(File.read("./Gemfile-base"))
2
-
3
- gem "rails", "3.0.0"
data/Gemfile-3.0.3 DELETED
@@ -1,3 +0,0 @@
1
- instance_eval(File.read("./Gemfile-base"))
2
-
3
- gem "rails", "3.0.3"
data/Gemfile-base DELETED
@@ -1,38 +0,0 @@
1
- source "http://rubygems.org"
2
-
3
- %w[rspec rspec-core rspec-expectations rspec-mocks rspec-rails].each do |lib|
4
- library_path = File.expand_path("../../#{lib}", __FILE__)
5
- if File.exist?(library_path)
6
- gem lib, :path => library_path
7
- else
8
- gem lib
9
- end
10
- end
11
-
12
- gem 'sqlite3-ruby', :require => 'sqlite3'
13
- gem "rake", "0.8.7"
14
- gem "cucumber", "0.10.0"
15
- gem "aruba", "0.2.2"
16
- gem "rcov", "0.9.9"
17
- gem "relish", "0.2.0"
18
- gem "guard-rspec", "0.1.9"
19
- gem "growl", "1.0.3"
20
- gem "ZenTest", "~> 4.4.2"
21
- gem "webrat", "0.7.2"
22
-
23
- if RUBY_PLATFORM =~ /darwin/
24
- gem "autotest-fsevent", "~> 0.2.4"
25
- gem "autotest-growl", "~> 0.2.9"
26
- end
27
-
28
- gem "ruby-debug", :platforms => :ruby_18
29
- gem "ruby-debug19", "~> 0.11.6", :platforms => :ruby_19
30
-
31
- platforms :ruby_18, :ruby_19 do
32
- gem "rb-fsevent", "~> 0.3.9"
33
- gem "ruby-prof", "~> 0.9.2"
34
- end
35
-
36
- platforms :jruby do
37
- gem "jruby-openssl"
38
- end
data/Gemfile-master DELETED
@@ -1,5 +0,0 @@
1
- instance_eval(File.read("./Gemfile-base"))
2
-
3
- gem "rails", :git => "https://github.com/rails/rails.git"
4
- gem "arel", :git => "https://github.com/rails/arel.git"
5
- gem "rack", :git => "https://github.com/rack/rack.git"
@@ -1,30 +0,0 @@
1
- begin
2
- require 'capybara/rails'
3
- rescue LoadError
4
- end
5
-
6
- begin
7
- require 'webrat'
8
- rescue LoadError
9
- end
10
-
11
- module RSpec
12
- module Rails
13
- module BrowserSimulators
14
- extend ActiveSupport::Concern
15
-
16
- def self.included(mod)
17
- mod.instance_eval do
18
- def webrat(&block)
19
- block.call if defined?(Webrat)
20
- end
21
-
22
- def capybara(&block)
23
- block.call if defined?(Capybara)
24
- end
25
- end
26
- end
27
-
28
- end
29
- end
30
- end
data/specs.watchr DELETED
@@ -1,59 +0,0 @@
1
- # Run me with:
2
- #
3
- # $ watchr specs.watchr
4
-
5
- # --------------------------------------------------
6
- # Convenience Methods
7
- # --------------------------------------------------
8
- def all_spec_files
9
- Dir['spec/**/*_spec.rb']
10
- end
11
-
12
- def run_spec_matching(thing_to_match)
13
- matches = all_spec_files.grep(/#{thing_to_match}/i)
14
- if matches.empty?
15
- puts "Sorry, thanks for playing, but there were no matches for #{thing_to_match}"
16
- else
17
- run matches.join(' ')
18
- end
19
- end
20
-
21
- def run(files_to_run)
22
- puts("Running: #{files_to_run}")
23
- system("clear;rspec -cfs #{files_to_run}")
24
- no_int_for_you
25
- end
26
-
27
- def run_all_specs
28
- run(all_spec_files.join(' '))
29
- end
30
-
31
- # --------------------------------------------------
32
- # Watchr Rules
33
- # --------------------------------------------------
34
- watch('^spec/(.*)_spec\.rb') { |m| run_spec_matching(m[1]) }
35
- watch('^lib/(.*)\.rb') { |m| run_spec_matching(m[1]) }
36
- watch('^spec/spec_helper\.rb') { run_all_specs }
37
- watch('^spec/support/.*\.rb') { run_all_specs }
38
-
39
- # --------------------------------------------------
40
- # Signal Handling
41
- # --------------------------------------------------
42
-
43
- def no_int_for_you
44
- @sent_an_int = nil
45
- end
46
-
47
- Signal.trap 'INT' do
48
- if @sent_an_int then
49
- puts " A second INT? Ok, I get the message. Shutting down now."
50
- exit
51
- else
52
- puts " Did you just send me an INT? Ugh. I'll quit for real if you do it again."
53
- @sent_an_int = true
54
- Kernel.sleep 1.5
55
- run_all_specs
56
- end
57
- end
58
-
59
- # vim:ft=ruby
@@ -1,17 +0,0 @@
1
- source 'http://rubygems.org'
2
-
3
- group :development, :test do
4
- %w[rspec rspec-core rspec-expectations rspec-mocks rspec-rails].each do |lib|
5
- library_path = File.expand_path("../../../../#{lib}", __FILE__)
6
- if File.exist?(library_path)
7
- gem lib, :path => library_path
8
- else
9
- gem lib
10
- end
11
- end
12
- gem "rcov"
13
- gem "webrat", "0.7.2"
14
- gem "ZenTest", "4.4.2"
15
- end
16
-
17
- gem 'sqlite3-ruby', :require => 'sqlite3'