Skip to content

Commit 3eeff1e

Browse files
author
Laurent Cobos
committed
fix spec
1 parent 7b7ce05 commit 3eeff1e

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

lib/rspec/rails/fixture_file_upload_support.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ module FixtureFileUploadSupport
77
private
88

99
def rails_fixture_file_wrapper
10+
RailsFixtureFileWrapper.fixture_path = nil
1011
resolved_fixture_path = (fixture_path || RSpec.configuration.fixture_path || '')
1112
RailsFixtureFileWrapper.fixture_path = File.join(resolved_fixture_path, '') unless resolved_fixture_path.strip.empty?
1213
RailsFixtureFileWrapper.instance

spec/rspec/rails/fixture_file_upload_support_spec.rb

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
module RSpec::Rails
44
describe FixtureFileUploadSupport do
55
context 'with fixture path set in config' do
6-
before { RSpec.configuration.fixture_path = File.dirname(__FILE__) }
7-
86
it 'resolves fixture file' do
7+
RSpec.configuration.fixture_path = File.dirname(__FILE__)
98
expect(fixture_file_upload_resolved('fixture_file_upload_support_spec.rb').run).to be true
109
end
1110
end
@@ -17,18 +16,17 @@ module RSpec::Rails
1716
end
1817

1918
context 'with fixture path not set' do
20-
before { RSpec.configuration.fixture_path = nil }
21-
22-
it 'resolves fixture with relative path' do
23-
expect(fixture_file_upload_resolved('fixture_file_upload_support_spec.rb').run).to be true
19+
it 'resolves fixture using relative path' do
20+
RSpec.configuration.fixture_path = nil
21+
expect(fixture_file_upload_resolved('spec/rspec/rails/fixture_file_upload_support_spec.rb').run).to be true
2422
end
2523
end
2624

2725
def fixture_file_upload_resolved(fixture_name, fixture_path = nil)
2826
RSpec::Core::ExampleGroup.describe do
2927
include RSpec::Rails::FixtureFileUploadSupport
3028

31-
self.fixture_path = fixture_path if fixture_path
29+
self.fixture_path = fixture_path
3230

3331
it 'supports fixture file upload' do
3432
file = fixture_file_upload(fixture_name)

0 commit comments

Comments
 (0)