Merge branch 'feature/qa/gb/populate-qa-factories-with-data' into 'master'

Make it possible to populate QA factory product with a data from a browser

See merge request gitlab-org/gitlab-ce!16384

2 files changed, 52 insertions, 35 deletions

diff --git a/qa/spec/factory/base_spec.rb b/qa/spec/factory/base_spec.rb
index a3ba0176819..90dd58e20fd 100644
--- a/qa/spec/factory/base_spec.rb
+++ b/qa/spec/factory/base_spec.rb
@@ -1,8 +1,9 @@
 describe QA::Factory::Base do
+  let(:factory) { spy('factory') }
+  let(:product) { spy('product') }
+
   describe '.fabricate!' do
     subject { Class.new(described_class) }
-    let(:factory) { spy('factory') }
-    let(:product) { spy('product') }
 
     before do
       allow(QA::Factory::Product).to receive(:new).and_return(product)
@@ -59,30 +60,63 @@ describe QA::Factory::Base do
     it 'defines dependency accessors' do
       expect(subject.new).to respond_to :mydep, :mydep=
     end
-  end
 
-  describe 'building dependencies' do
-    let(:dependency) { double('dependency') }
-    let(:instance) { spy('instance') }
+    describe 'dependencies fabrication' do
+      let(:dependency) { double('dependency') }
+      let(:instance) { spy('instance') }
+
+      subject do
+        Class.new(described_class) do
+          dependency Some::MyDependency, as: :mydep
+        end
+      end
+
+      before do
+        stub_const('Some::MyDependency', dependency)
 
+        allow(subject).to receive(:new).and_return(instance)
+        allow(instance).to receive(:mydep).and_return(nil)
+        allow(QA::Factory::Product).to receive(:new)
+      end
+
+      it 'builds all dependencies first' do
+        expect(dependency).to receive(:fabricate!).once
+
+        subject.fabricate!
+      end
+    end
+  end
+
+  describe '.product' do
     subject do
       Class.new(described_class) do
-        dependency Some::MyDependency, as: :mydep
+        product :token do
+          page.do_something_on_page!
+          'resulting value'
+        end
       end
     end
 
-    before do
-      stub_const('Some::MyDependency', dependency)
-
-      allow(subject).to receive(:new).and_return(instance)
-      allow(instance).to receive(:mydep).and_return(nil)
-      allow(QA::Factory::Product).to receive(:new)
+    it 'appends new product attribute' do
+      expect(subject.attributes).to be_one
+      expect(subject.attributes).to have_key(:token)
     end
 
-    it 'builds all dependencies first' do
-      expect(dependency).to receive(:fabricate!).once
+    describe 'populating fabrication product with data' do
+      let(:page) { spy('page') }
+
+      before do
+        allow(subject).to receive(:new).and_return(factory)
+        allow(QA::Factory::Product).to receive(:new).and_return(product)
+        allow(product).to receive(:page).and_return(page)
+      end
 
-      subject.fabricate!
+      it 'populates product after fabrication' do
+        subject.fabricate!
+
+        expect(page).to have_received(:do_something_on_page!)
+        expect(product.token).to eq 'resulting value'
+      end
     end
   end
 end
diff --git a/qa/spec/factory/product_spec.rb b/qa/spec/factory/product_spec.rb
index 3d9e86a641b..fdfb1ec90cc 100644
--- a/qa/spec/factory/product_spec.rb
+++ b/qa/spec/factory/product_spec.rb
@@ -3,19 +3,8 @@ describe QA::Factory::Product do
   let(:product) { spy('product') }
 
   describe '.populate!' do
-    it 'instantiates and yields factory' do
-      expect(described_class).to receive(:new).with(factory)
-
-      described_class.populate!(factory) do |instance|
-        instance.something = 'string'
-      end
-
-      expect(factory).to have_received(:something=).with('string')
-    end
-
     it 'returns a fabrication product' do
-      expect(described_class).to receive(:new)
-        .with(factory).and_return(product)
+      expect(described_class).to receive(:new).and_return(product)
 
       result = described_class.populate!(factory) do |instance|
         instance.something = 'string'
@@ -23,11 +12,6 @@ describe QA::Factory::Product do
 
       expect(result).to be product
     end
-
-    it 'raises unless block given' do
-      expect { described_class.populate!(factory) }
-        .to raise_error ArgumentError
-    end
   end
 
   describe '.visit!' do
@@ -37,8 +21,7 @@ describe QA::Factory::Product do
       allow_any_instance_of(described_class)
         .to receive(:visit).and_return('visited some url')
 
-      expect(described_class.new(factory).visit!)
-        .to eq 'visited some url'
+      expect(subject.visit!).to eq 'visited some url'
     end
   end
 end