diff options
author | ddavison <ddavison@gitlab.com> | 2018-07-23 16:48:19 -0400 |
---|---|---|
committer | ddavison <ddavison@gitlab.com> | 2018-07-23 16:48:19 -0400 |
commit | f570853371b819f5eebfff437f00e8deb81f85b8 (patch) | |
tree | cfc8afd7e0d88c1011c8bccbaa302aec4810b729 | |
parent | 3df3379c7d25993340bd91a66e1f4cbbc448f391 (diff) | |
download | gitlab-ce-f570853371b819f5eebfff437f00e8deb81f85b8.tar.gz |
fix pathing discrepancy between local and ci ran tests.
use subject
-rw-r--r-- | qa/spec/scenario/test/instance/all_spec.rb | 2 | ||||
-rw-r--r-- | qa/spec/scenario/test/instance/smoke_spec.rb | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/qa/spec/scenario/test/instance/all_spec.rb b/qa/spec/scenario/test/instance/all_spec.rb index a4b84f49db3..62732e18973 100644 --- a/qa/spec/scenario/test/instance/all_spec.rb +++ b/qa/spec/scenario/test/instance/all_spec.rb @@ -26,7 +26,7 @@ describe QA::Scenario::Test::Instance::All do subject.perform("test") expect(runner).to have_received(:options=) - .with(::File.expand_path('../../../qa/specs/features', __dir__)) + .with(::File.expand_path('../../../../qa/specs/features', __dir__)) end end diff --git a/qa/spec/scenario/test/instance/smoke_spec.rb b/qa/spec/scenario/test/instance/smoke_spec.rb index ac072a5b22a..f7fa1ac047e 100644 --- a/qa/spec/scenario/test/instance/smoke_spec.rb +++ b/qa/spec/scenario/test/instance/smoke_spec.rb @@ -1,6 +1,5 @@ describe QA::Scenario::Test::Instance::Smoke do - let(:smoke_test) { Class.new(described_class) { tags :smoke } } - let(:core_test) { Class.new(described_class) } + subject { Class.new(described_class) { tags :smoke } } context '#perform' do let(:arguments) { spy('Runtime::Scenario') } @@ -23,7 +22,7 @@ describe QA::Scenario::Test::Instance::Smoke do end it 'has a smoke tag' do - expect(smoke_test.tags).to eq([:smoke]) + expect(subject.tags).to eq([:smoke]) end context 'no paths' do @@ -31,7 +30,7 @@ describe QA::Scenario::Test::Instance::Smoke do subject.perform("test") expect(runner).to have_received(:options=) - .with(File.expand_path('../../../qa/specs/features', __dir__)) + .with(File.expand_path('../../../../qa/specs/features', __dir__)) end end |