rspec-rails 2.10.0 → 2.10.1
Sign up to get free protection for your applications and to get access to all the features.
data/Changelog.md
CHANGED
@@ -1,3 +1,11 @@
|
|
1
|
+
### 2.10.1 / 2012-05-03
|
2
|
+
[full changelog](http://github.com/rspec/rspec-rails/compare/v2.10.0...v2.10.1)
|
3
|
+
|
4
|
+
Bug fixes
|
5
|
+
|
6
|
+
* fix regression introduced in 2.10.0 that broke integration with Devise
|
7
|
+
(https://github.com/rspec/rspec-rails/issues/534)
|
8
|
+
|
1
9
|
### 2.10.0 / 2012-05-03
|
2
10
|
[full changelog](http://github.com/rspec/rspec-rails/compare/v2.9.0...v2.10.0)
|
3
11
|
|
data/lib/rspec/rails/adapters.rb
CHANGED
@@ -12,7 +12,13 @@ module RSpec
|
|
12
12
|
# Wraps `setup` calls from within Rails' testing framework in `before`
|
13
13
|
# hooks.
|
14
14
|
def setup(*methods)
|
15
|
-
methods.each
|
15
|
+
methods.each do |method|
|
16
|
+
if method.to_s =~ /^setup_(fixtures|controller_request_and_response)$/
|
17
|
+
prepend_before { send method }
|
18
|
+
else
|
19
|
+
before { send method }
|
20
|
+
end
|
21
|
+
end
|
16
22
|
end
|
17
23
|
|
18
24
|
# @api private
|
@@ -20,7 +26,7 @@ module RSpec
|
|
20
26
|
# Wraps `teardown` calls from within Rails' testing framework in
|
21
27
|
# `after` hooks.
|
22
28
|
def teardown(*methods)
|
23
|
-
methods.each {|method| after { send method } }
|
29
|
+
methods.each { |method| after { send method } }
|
24
30
|
end
|
25
31
|
end
|
26
32
|
|
data/lib/rspec/rails/version.rb
CHANGED
@@ -0,0 +1,32 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe RSpec::Rails::SetupAndTeardownAdapter do
|
4
|
+
describe "::setup" do
|
5
|
+
it "registers before hooks in the order setup is received" do
|
6
|
+
klass = Class.new do
|
7
|
+
include RSpec::Rails::SetupAndTeardownAdapter
|
8
|
+
def self.foo; "foo"; end
|
9
|
+
def self.bar; "bar"; end
|
10
|
+
end
|
11
|
+
klass.should_receive(:before).ordered { |&block| block.call.should eq "foo" }
|
12
|
+
klass.should_receive(:before).ordered { |&block| block.call.should eq "bar" }
|
13
|
+
|
14
|
+
klass.setup :foo
|
15
|
+
klass.setup :bar
|
16
|
+
end
|
17
|
+
|
18
|
+
it "registers prepend_before hooks for the Rails' setup methods" do
|
19
|
+
klass = Class.new do
|
20
|
+
include RSpec::Rails::SetupAndTeardownAdapter
|
21
|
+
def self.setup_fixtures; "setup fixtures" end
|
22
|
+
def self.setup_controller_request_and_response; "setup controller" end
|
23
|
+
end
|
24
|
+
|
25
|
+
klass.should_receive(:prepend_before) { |&block| block.call.should eq "setup fixtures" }
|
26
|
+
klass.should_receive(:prepend_before) { |&block| block.call.should eq "setup controller" }
|
27
|
+
|
28
|
+
klass.setup :setup_fixtures
|
29
|
+
klass.setup :setup_controller_request_and_response
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rspec-rails
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.10.
|
4
|
+
version: 2.10.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-05-
|
12
|
+
date: 2012-05-05 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: activesupport
|
@@ -146,7 +146,7 @@ dependencies:
|
|
146
146
|
requirements:
|
147
147
|
- - '='
|
148
148
|
- !ruby/object:Gem::Version
|
149
|
-
version: 0.2.
|
149
|
+
version: 0.2.5
|
150
150
|
type: :development
|
151
151
|
prerelease: false
|
152
152
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -154,7 +154,7 @@ dependencies:
|
|
154
154
|
requirements:
|
155
155
|
- - '='
|
156
156
|
- !ruby/object:Gem::Version
|
157
|
-
version: 0.2.
|
157
|
+
version: 0.2.5
|
158
158
|
description: RSpec for Rails
|
159
159
|
email: rspec-users@rubyforge.org
|
160
160
|
executables: []
|
@@ -296,6 +296,7 @@ files:
|
|
296
296
|
- spec/rspec/rails/matchers/route_to_spec.rb
|
297
297
|
- spec/rspec/rails/mocks/mock_model_spec.rb
|
298
298
|
- spec/rspec/rails/mocks/stub_model_spec.rb
|
299
|
+
- spec/rspec/rails/setup_and_teardown_adapter_spec.rb
|
299
300
|
- spec/rspec/rails/view_rendering_spec.rb
|
300
301
|
- spec/spec_helper.rb
|
301
302
|
- spec/support/ar_classes.rb
|
@@ -317,7 +318,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
317
318
|
version: '0'
|
318
319
|
segments:
|
319
320
|
- 0
|
320
|
-
hash: -
|
321
|
+
hash: -3242320813797165557
|
321
322
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
322
323
|
none: false
|
323
324
|
requirements:
|
@@ -326,13 +327,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
326
327
|
version: '0'
|
327
328
|
segments:
|
328
329
|
- 0
|
329
|
-
hash: -
|
330
|
+
hash: -3242320813797165557
|
330
331
|
requirements: []
|
331
332
|
rubyforge_project: rspec
|
332
333
|
rubygems_version: 1.8.24
|
333
334
|
signing_key:
|
334
335
|
specification_version: 3
|
335
|
-
summary: rspec-rails-2.10.
|
336
|
+
summary: rspec-rails-2.10.1
|
336
337
|
test_files:
|
337
338
|
- features/Autotest.md
|
338
339
|
- features/Generators.md
|
@@ -404,6 +405,7 @@ test_files:
|
|
404
405
|
- spec/rspec/rails/matchers/route_to_spec.rb
|
405
406
|
- spec/rspec/rails/mocks/mock_model_spec.rb
|
406
407
|
- spec/rspec/rails/mocks/stub_model_spec.rb
|
408
|
+
- spec/rspec/rails/setup_and_teardown_adapter_spec.rb
|
407
409
|
- spec/rspec/rails/view_rendering_spec.rb
|
408
410
|
- spec/spec_helper.rb
|
409
411
|
- spec/support/ar_classes.rb
|