Automatic merge of gitlab-org/gitlab-ce master

doc/development/fe_guide/vuex.md

@@ -120,8 +120,8 @@ create:
 1. An action `receiveSomethingError`, to handle the error callback
 1. An action `fetchSomething` to make the request.
     1. In case your application does more than a `GET` request you can use these as examples:
-        - `PUT`: `createSomething`
-        - `POST`: `updateSomething`
+        - `POST`: `createSomething`
+        - `PUT`: `updateSomething`
         - `DELETE`: `deleteSomething`
 
 The component MUST only dispatch the `fetchNamespace` action. Actions namespaced with `request` or `receive` should not be called from the component

qa/qa/resource/base.rb

@@ -116,23 +116,13 @@ module QA
       end
       private_class_method :evaluator
 
-      def self.dynamic_attributes
-        const_get(:DynamicAttributes)
-      rescue NameError
-        mod = const_set(:DynamicAttributes, Module.new)
-
-        include mod
-
-        mod
-      end
-
       class DSL
         def initialize(base)
           @base = base
         end
 
         def attribute(name, &block)
-          @base.dynamic_attributes.module_eval do
+          @base.module_eval do
             attr_writer(name)
 
             define_method(name) do

qa/qa/resource/fork.rb

@@ -3,6 +3,13 @@
 module QA
   module Resource
     class Fork < Base
+      attribute :project do
+        Resource::Project.fabricate! do |resource|
+          resource.name = push.project.name
+          resource.path_with_namespace = "#{user.name}/#{push.project.name}"
+        end
+      end
+
       attribute :push do
         Repository::ProjectPush.fabricate!
       end
@@ -37,6 +44,8 @@ module QA
         Page::Layout::Banner.perform do |page|
           page.has_notice?('The project was successfully forked.')
         end
+
+        populate(:project)
       end
     end
   end

qa/qa/resource/merge_request_from_fork.rb

@@ -11,7 +11,7 @@ module QA
 
       attribute :push do
         Repository::ProjectPush.fabricate! do |resource|
-          resource.project = fork
+          resource.project = fork.project
           resource.branch_name = fork_branch
           resource.file_name = 'file2.txt'
           resource.user = fork.user

qa/qa/resource/project.rb

@@ -12,6 +12,10 @@ module QA
         Group.fabricate!
       end
 
+      attribute :path_with_namespace do
+        "#{group.sandbox.path}/#{group.path}/#{name}" if group
+      end
+
       attribute :repository_ssh_location do
         Page::Project::Show.perform do |page|
           page.repository_clone_ssh_location
@@ -46,8 +50,14 @@ module QA
         end
       end
 
+      def fabricate_via_api!
+        resource_web_url(api_get)
+      rescue ResourceNotFoundError
+        super
+      end
+
       def api_get_path
-        "/projects/#{name}"
+        "/projects/#{CGI.escape(path_with_namespace)}"
       end
 
       def api_post_path

qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb

@@ -5,18 +5,18 @@ module QA
     describe 'Merge request creation from fork' do
       it 'user forks a project, submits a merge request and maintainer merges it' do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
-        Page::Main::Login.act { sign_in_using_credentials }
+        Page::Main::Login.perform(&:sign_in_using_credentials)
 
         merge_request = Resource::MergeRequestFromFork.fabricate! do |merge_request|
           merge_request.fork_branch = 'feature-branch'
         end
 
-        Page::Main::Menu.perform { |main| main.sign_out }
-        Page::Main::Login.perform { |login| login.sign_in_using_credentials }
+        Page::Main::Menu.perform(&:sign_out)
+        Page::Main::Login.perform(&:sign_in_using_credentials)
 
         merge_request.visit!
 
-        Page::MergeRequest::Show.perform { |show| show.merge! }
+        Page::MergeRequest::Show.perform(&:merge!)
 
         expect(page).to have_content('The changes were merged')
       end

qa/spec/resource/base_spec.rb

@@ -213,6 +213,42 @@ describe QA::Resource::Base do
           .to raise_error(described_class::NoValueError, "No value was computed for no_block of #{resource.class.name}.")
       end
     end
+
+    context 'when multiple resources have the same attribute name' do
+      let(:base) do
+        Class.new(QA::Resource::Base) do
+          def fabricate!
+            'any'
+          end
+
+          def self.current_url
+            'http://stub'
+          end
+        end
+      end
+      let(:first_resource) do
+        Class.new(base) do
+          attribute :test do
+            'first block'
+          end
+        end
+      end
+      let(:second_resource) do
+        Class.new(base) do
+          attribute :test do
+            'second block'
+          end
+        end
+      end
+
+      it 'has unique attribute values' do
+        first_result = first_resource.fabricate!(resource: first_resource.new)
+        second_result = second_resource.fabricate!(resource: second_resource.new)
+
+        expect(first_result.test).to eq 'first block'
+        expect(second_result.test).to eq 'second block'
+      end
+    end
   end
 
   describe '#web_url' do