Automatic merge of gitlab-org/gitlab-ce master

qa/qa/resource/base.rb

@@ -15,6 +15,38 @@ module QA
 
       def_delegators :evaluator, :attribute
 
+      def self.fabricate!(*args, &prepare_block)
+        fabricate_via_api!(*args, &prepare_block)
+      rescue NotImplementedError
+        fabricate_via_browser_ui!(*args, &prepare_block)
+      end
+
+      def self.fabricate_via_browser_ui!(*args, &prepare_block)
+        options = args.extract_options!
+        resource = options.fetch(:resource) { new }
+        parents = options.fetch(:parents) { [] }
+
+        do_fabricate!(resource: resource, prepare_block: prepare_block, parents: parents) do
+          log_fabrication(:browser_ui, resource, parents, args) { resource.fabricate!(*args) }
+
+          current_url
+        end
+      end
+
+      def self.fabricate_via_api!(*args, &prepare_block)
+        options = args.extract_options!
+        resource = options.fetch(:resource) { new }
+        parents = options.fetch(:parents) { [] }
+
+        raise NotImplementedError unless resource.api_support?
+
+        resource.eager_load_api_client!
+
+        do_fabricate!(resource: resource, prepare_block: prepare_block, parents: parents) do
+          log_fabrication(:api, resource, parents, args) { resource.fabricate_via_api! }
+        end
+      end
+
       def fabricate!(*_args)
         raise NotImplementedError
       end
@@ -55,38 +87,6 @@ module QA
         QA::Runtime::Logger.info "<#{self.class}> Attribute #{name.inspect} has both API response `#{api_value}` and a block. API response will be picked. Block will be ignored."
       end
 
-      def self.fabricate!(*args, &prepare_block)
-        fabricate_via_api!(*args, &prepare_block)
-      rescue NotImplementedError
-        fabricate_via_browser_ui!(*args, &prepare_block)
-      end
-
-      def self.fabricate_via_browser_ui!(*args, &prepare_block)
-        options = args.extract_options!
-        resource = options.fetch(:resource) { new }
-        parents = options.fetch(:parents) { [] }
-
-        do_fabricate!(resource: resource, prepare_block: prepare_block, parents: parents) do
-          log_fabrication(:browser_ui, resource, parents, args) { resource.fabricate!(*args) }
-
-          current_url
-        end
-      end
-
-      def self.fabricate_via_api!(*args, &prepare_block)
-        options = args.extract_options!
-        resource = options.fetch(:resource) { new }
-        parents = options.fetch(:parents) { [] }
-
-        raise NotImplementedError unless resource.api_support?
-
-        resource.eager_load_api_client!
-
-        do_fabricate!(resource: resource, prepare_block: prepare_block, parents: parents) do
-          log_fabrication(:api, resource, parents, args) { resource.fabricate_via_api! }
-        end
-      end
-
       def self.do_fabricate!(resource:, prepare_block:, parents: [])
         prepare_block.call(resource) if prepare_block
 

qa/qa/resource/file.rb

@@ -3,9 +3,12 @@
 module QA
   module Resource
     class File < Base
-      attr_accessor :name,
+      attr_accessor :author_email,
+                    :author_name,
+                    :branch,
                     :content,
-                    :commit_message
+                    :commit_message,
+                    :name
 
       attribute :project do
         Project.fabricate! do |resource|
@@ -31,6 +34,30 @@ module QA
           page.commit_changes
         end
       end
+
+      def resource_web_url(resource)
+        super
+      rescue ResourceURLMissingError
+        # this particular resource does not expose a web_url property
+      end
+
+      def api_get_path
+        "/projects/#{CGI.escape(project.path_with_namespace)}/repository/files/#{CGI.escape(@name)}"
+      end
+
+      def api_post_path
+        api_get_path
+      end
+
+      def api_post_body
+        {
+          branch: @branch || "master",
+          author_email: @author_email || Runtime::User.default_email,
+          author_name: @author_name || Runtime::User.username,
+          content: content,
+          commit_message: commit_message
+        }
+      end
     end
   end
 end

qa/qa/specs/features/browser_ui/3_create/repository/create_edit_delete_file_via_web_spec.rb

@@ -12,7 +12,7 @@ module QA
         file_content = 'QA Test - File content'
         commit_message_for_create = 'QA Test - Create new file'
 
-        Resource::File.fabricate! do |file|
+        Resource::File.fabricate_via_browser_ui! do |file|
           file.name = file_name
           file.content = file_content
           file.commit_message = commit_message_for_create

qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb

@@ -3,13 +3,16 @@
 module QA
   context 'Create' do
     # failure reported: https://gitlab.com/gitlab-org/quality/nightly/issues/42
-    # also failing in staging until the fix is picked into the next release:
-    #  https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24533
     describe 'Commit data', :quarantine do
       before(:context) do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
         Page::Main::Login.perform(&:sign_in_using_credentials)
 
+        # Get the user's details to confirm they're included in the email patch
+        @user = Resource::User.fabricate_via_api! do |user|
+          user.username = Runtime::User.username
+        end
+
         project_push = Resource::Repository::ProjectPush.fabricate! do |push|
           push.file_name = 'README.md'
           push.file_content = '# This is a test project'
@@ -21,12 +24,13 @@ module QA
         # add second file to repo to enable diff from initial commit
         @commit_message = 'Add second file'
 
-        Page::Project::Show.perform(&:create_new_file!)
-        Page::File::Form.perform do |f|
-          f.add_name('second')
-          f.add_content('second file content')
-          f.add_commit_message(@commit_message)
-          f.commit_changes
+        Resource::File.fabricate_via_api! do |file|
+          file.project = @project
+          file.name = 'second'
+          file.content = 'second file content'
+          file.commit_message = @commit_message
+          file.author_name = @user.name
+          file.author_email = @user.public_email
         end
       end
 
@@ -42,15 +46,11 @@ module QA
       end
 
       it 'user views raw email patch' do
-        user = Resource::User.fabricate_via_api! do |user|
-          user.username = Runtime::User.username
-        end
-
         view_commit
 
         Page::Project::Commit::Show.perform(&:select_email_patches)
 
-        expect(page).to have_content("From: #{user.name} <#{user.public_email}>")
+        expect(page).to have_content("From: #{@user.name} <#{@user.public_email}>")
         expect(page).to have_content('Subject: [PATCH] Add second file')
         expect(page).to have_content('diff --git a/second b/second')
       end