Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-ee-to-ce-backport

3 files changed, 60 insertions, 11 deletions

diff --git a/qa/spec/runtime/scenario_spec.rb b/qa/spec/runtime/scenario_spec.rb
new file mode 100644
index 00000000000..7009192bcc0
--- /dev/null
+++ b/qa/spec/runtime/scenario_spec.rb
@@ -0,0 +1,27 @@
+describe QA::Runtime::Scenario do
+  subject do
+    Module.new.extend(described_class)
+  end
+
+  it 'makes it possible to define global scenario attributes' do
+    subject.define(:my_attribute, 'some-value')
+    subject.define(:another_attribute, 'another-value')
+
+    expect(subject.my_attribute).to eq 'some-value'
+    expect(subject.another_attribute).to eq 'another-value'
+    expect(subject.attributes)
+      .to eq(my_attribute: 'some-value', another_attribute: 'another-value')
+  end
+
+  it 'raises error when attribute is not known' do
+    expect { subject.invalid_accessor }
+      .to raise_error ArgumentError, /invalid_accessor/
+  end
+
+  it 'raises error when attribute is empty' do
+    subject.define(:empty_attribute, '')
+
+    expect { subject.empty_attribute }
+      .to raise_error ArgumentError, /empty_attribute/
+  end
+end
diff --git a/qa/spec/scenario/bootable_spec.rb b/qa/spec/scenario/bootable_spec.rb
new file mode 100644
index 00000000000..273aac7677e
--- /dev/null
+++ b/qa/spec/scenario/bootable_spec.rb
@@ -0,0 +1,24 @@
+describe QA::Scenario::Bootable do
+  subject do
+    Class.new(QA::Scenario::Template)
+      .include(described_class)
+  end
+
+  it 'makes it possible to define the scenario attribute' do
+    subject.class_eval do
+      attribute :something, '--something SOMETHING', 'Some attribute'
+      attribute :another, '--another ANOTHER', 'Some other attribute'
+    end
+
+    expect(subject).to receive(:perform)
+      .with(something: 'test', another: 'other')
+
+    subject.launch!(%w[--another other --something test])
+  end
+
+  it 'does not require attributes to be defined' do
+    expect(subject).to receive(:perform).with('some', 'argv')
+
+    subject.launch!(%w[some argv])
+  end
+end
diff --git a/qa/spec/scenario/entrypoint_spec.rb b/qa/spec/scenario/entrypoint_spec.rb
index 3fd068b641c..aec79dcea04 100644
--- a/qa/spec/scenario/entrypoint_spec.rb
+++ b/qa/spec/scenario/entrypoint_spec.rb
@@ -6,31 +6,30 @@ describe QA::Scenario::Entrypoint do
   end
 
   context '#perform' do
-    let(:config) { spy('Specs::Config') }
+    let(:arguments) { spy('Runtime::Scenario') }
     let(:release) { spy('Runtime::Release') }
     let(:runner) { spy('Specs::Runner') }
 
     before do
-      allow(config).to receive(:perform) { |&block| block.call config }
-      allow(runner).to receive(:perform) { |&block| block.call runner }
-
-      stub_const('QA::Specs::Config', config)
       stub_const('QA::Runtime::Release', release)
+      stub_const('QA::Runtime::Scenario', arguments)
       stub_const('QA::Specs::Runner', runner)
+
+      allow(runner).to receive(:perform).and_yield(runner)
     end
 
-    it 'should set address' do
+    it 'sets an address of the subject' do
       subject.perform("hello")
 
-      expect(config).to have_received(:address=).with("hello")
+      expect(arguments).to have_received(:define)
+        .with(:gitlab_address, "hello")
     end
 
     context 'no paths' do
       it 'should call runner with default arguments' do
         subject.perform("test")
 
-        expect(runner).to have_received(:rspec)
-          .with(hash_including(files: 'qa/specs/features'))
+        expect(runner).to have_received(:files=).with('qa/specs/features')
       end
     end
 
@@ -38,8 +37,7 @@ describe QA::Scenario::Entrypoint do
       it 'should call runner with paths' do
         subject.perform('test', 'path1', 'path2')
 
-        expect(runner).to have_received(:rspec)
-          .with(hash_including(files: %w(path1 path2)))
+        expect(runner).to have_received(:files=).with(%w[path1 path2])
       end
     end
   end