Automatic merge of gitlab-org/gitlab-ce master

doc/ci/variables/where_variables_can_be_used.md

@@ -16,9 +16,9 @@ There are two places defined variables can be used. On the:
 ### `.gitlab-ci.yml` file
 
 | Definition                                 | Can be expanded? | Expansion place        | Description                                                                                                                                                                                                                                                                                                                                                                                                                       |
-|--------------------------------------|-------------------|-----------------|--------------|
-| `environment:url`                    | yes               | GitLab           | The variable expansion is made by GitLab's [internal variable expansion mechanism](#gitlab-internal-variable-expansion-mechanism).<ul><li>Supported: all variables defined for a job (project/group variables, variables from `.gitlab-ci.yml`, variables from triggers, variables from pipeline schedules)</li><li>Not supported: variables defined in Runner's `config.toml` and variables created in job's `script`</li></ul> |
-| `environment:name`                   | yes               | GitLab           | Similar to `environment:url`, but the variables expansion doesn't support: <ul><li>variables that are based on the environment's name (`CI_ENVIRONMENT_NAME`, `CI_ENVIRONMENT_SLUG`)</li><li>any other variables related to environment (currently only `CI_ENVIRONMENT_URL`)</li><li>[persisted variables](#persisted-variables)</li></ul> |
+|:-------------------------------------------|:-----------------|:-----------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `environment:url`                          | yes              | GitLab                 | The variable expansion is made by GitLab's [internal variable expansion mechanism](#gitlab-internal-variable-expansion-mechanism).<br/><br/>Supported are all variables defined for a job (project/group variables, variables from `.gitlab-ci.yml`, variables from triggers, variables from pipeline schedules).<br/><br/>Not supported are variables defined in Runner's `config.toml` and variables created in job's `script`. |
+| `environment:name`                         | yes              | GitLab                 | Similar to `environment:url`, but the variables expansion doesn't support the following:<br/><br/>- Variables that are based on the environment's name (`CI_ENVIRONMENT_NAME`, `CI_ENVIRONMENT_SLUG`).<br/>- Any other variables related to environment (currently only `CI_ENVIRONMENT_URL`).<br/>- [Persisted variables](#persisted-variables).                                                                                 |
 | `variables`                                | yes              | Runner                 | The variable expansion is made by GitLab Runner's [internal variable expansion mechanism](#gitlab-runner-internal-variable-expansion-mechanism)                                                                                                                                                                                                                                                                                   |
 | `image`                                    | yes              | Runner                 | The variable expansion is made by GitLab Runner's [internal variable expansion mechanism](#gitlab-runner-internal-variable-expansion-mechanism)                                                                                                                                                                                                                                                                                   |
 | `services:[]`                              | yes              | Runner                 | The variable expansion is made by GitLab Runner's [internal variable expansion mechanism](#gitlab-runner-internal-variable-expansion-mechanism)                                                                                                                                                                                                                                                                                   |
@@ -26,7 +26,7 @@ There are two places defined variables can be used. On the:
 | `cache:key`                                | yes              | Runner                 | The variable expansion is made by GitLab Runner's [internal variable expansion mechanism](#gitlab-runner-internal-variable-expansion-mechanism)                                                                                                                                                                                                                                                                                   |
 | `artifacts:name`                           | yes              | Runner                 | The variable expansion is made by GitLab Runner's shell environment                                                                                                                                                                                                                                                                                                                                                               |
 | `script`, `before_script`, `after_script`  | yes              | Script execution shell | The variable expansion is made by the [execution shell environment](#execution-shell-environment)                                                                                                                                                                                                                                                                                                                                 |
-| `only:variables:[]`, `except:variables:[]`    | no                | n/a             | The variable must be in the form of `$variable`.<br/>Not supported:<ul><li>variables that are based on the environment's name (`CI_ENVIRONMENT_NAME`, `CI_ENVIRONMENT_SLUG`)</li><li>any other variables related to environment (currently only `CI_ENVIRONMENT_URL`)</li><li>[persisted variables](#persisted-variables)</li></ul> |
+| `only:variables:[]`, `except:variables:[]` | no               | n/a                    | The variable must be in the form of `$variable`. Not supported are the following:<br/><br/>- Variables that are based on the environment's name (`CI_ENVIRONMENT_NAME`, `CI_ENVIRONMENT_SLUG`).<br/>- Any other variables related to environment (currently only `CI_ENVIRONMENT_URL`).<br/>- [Persisted variables](#persisted-variables).                                                                                            |
 
 ### `config.toml` file
 
@@ -34,7 +34,7 @@ NOTE: **Note:**
 You can read more about `config.toml` in the [Runner's docs](https://docs.gitlab.com/runner/configuration/advanced-configuration.html).
 
 | Definition                           | Can be expanded? | Description                                                                                                                                  |
-|--------------------------------------|------------------|-------------|
+|:-------------------------------------|:-----------------|:---------------------------------------------------------------------------------------------------------------------------------------------|
 | `runners.environment`                | yes              | The variable expansion is made by the Runner's [internal variable expansion mechanism](#gitlab-runner-internal-variable-expansion-mechanism) |
 | `runners.kubernetes.pod_labels`      | yes              | The Variable expansion is made by the Runner's [internal variable expansion mechanism](#gitlab-runner-internal-variable-expansion-mechanism) |
 | `runners.kubernetes.pod_annotations` | yes              | The Variable expansion is made by the Runner's [internal variable expansion mechanism](#gitlab-runner-internal-variable-expansion-mechanism) |

spec/features/commits/user_uses_quick_actions_spec.rb

@@ -22,27 +22,6 @@ describe 'Commit > User uses quick actions', :js do
     let(:tag_message) { 'Stable release' }
     let(:truncated_commit_sha) { Commit.truncate_sha(commit.sha) }
 
-    it 'tags this commit' do
-      add_note("/tag #{tag_name} #{tag_message}")
-
-      expect(page).to have_content 'Commands applied'
-      expect(page).to have_content "tagged commit #{truncated_commit_sha}"
-      expect(page).to have_content tag_name
-
-      visit project_tag_path(project, tag_name)
-      expect(page).to have_content tag_name
-      expect(page).to have_content tag_message
-      expect(page).to have_content truncated_commit_sha
-    end
-
-    describe 'preview', :js do
-      it 'removes quick action from note and explains it' do
-        preview_note("/tag #{tag_name} #{tag_message}")
-
-        expect(page).not_to have_content '/tag'
-        expect(page).to have_content %{Tags this commit to #{tag_name} with "#{tag_message}"}
-        expect(page).to have_content tag_name
-      end
-    end
+    it_behaves_like 'tag quick action'
   end
 end

spec/features/merge_request/user_uses_quick_actions_spec.rb

@@ -56,6 +56,8 @@ describe 'Merge request > User uses quick actions', :js do
       project.add_maintainer(user)
     end
 
+    it_behaves_like 'merge quick action'
+
     describe 'toggling the WIP prefix in the title from note' do
       context 'when the current user can toggle the WIP prefix' do
         before do
@@ -103,74 +105,6 @@ describe 'Merge request > User uses quick actions', :js do
       end
     end
 
-    describe 'merging the MR from the note' do
-      context 'when the current user can merge the MR' do
-        before do
-          sign_in(user)
-          visit project_merge_request_path(project, merge_request)
-        end
-
-        it 'merges the MR' do
-          add_note("/merge")
-
-          expect(page).to have_content 'Commands applied'
-
-          expect(merge_request.reload).to be_merged
-        end
-      end
-
-      context 'when the head diff changes in the meanwhile' do
-        before do
-          merge_request.source_branch = 'another_branch'
-          merge_request.save
-          sign_in(user)
-          visit project_merge_request_path(project, merge_request)
-        end
-
-        it 'does not merge the MR' do
-          add_note("/merge")
-
-          expect(page).not_to have_content 'Your commands have been executed!'
-
-          expect(merge_request.reload).not_to be_merged
-        end
-      end
-
-      context 'when the current user cannot merge the MR' do
-        before do
-          project.add_guest(guest)
-          sign_in(guest)
-          visit project_merge_request_path(project, merge_request)
-        end
-
-        it 'does not merge the MR' do
-          add_note("/merge")
-
-          expect(page).not_to have_content 'Your commands have been executed!'
-
-          expect(merge_request.reload).not_to be_merged
-        end
-      end
-    end
-
-    describe 'adding a due date from note' do
-      before do
-        sign_in(user)
-        visit project_merge_request_path(project, merge_request)
-      end
-
-      it_behaves_like 'due quick action not available'
-    end
-
-    describe 'removing a due date from note' do
-      before do
-        sign_in(user)
-        visit project_merge_request_path(project, merge_request)
-      end
-
-      it_behaves_like 'remove_due_date action not available'
-    end
-
     describe '/target_branch command in merge request' do
       let(:another_project) { create(:project, :public, :repository) }
       let(:new_url_opts) { { merge_request: { source_branch: 'feature' } } }

spec/support/shared_examples/quick_actions/commit/tag_quick_action_shared_examples.rb

 # frozen_string_literal: true
 
 shared_examples 'tag quick action' do
+  context "post note to existing commit" do
+    it 'tags this commit' do
+      add_note("/tag #{tag_name} #{tag_message}")
+
+      expect(page).to have_content 'Commands applied'
+      expect(page).to have_content "tagged commit #{truncated_commit_sha}"
+      expect(page).to have_content tag_name
+
+      visit project_tag_path(project, tag_name)
+      expect(page).to have_content tag_name
+      expect(page).to have_content tag_message
+      expect(page).to have_content truncated_commit_sha
+    end
+  end
+
+  context 'preview', :js do
+    it 'removes quick action from note and explains it' do
+      preview_note("/tag #{tag_name} #{tag_message}")
+
+      expect(page).not_to have_content '/tag'
+      expect(page).to have_content %{Tags this commit to #{tag_name} with "#{tag_message}"}
+      expect(page).to have_content tag_name
+    end
+  end
 end

spec/support/shared_examples/quick_actions/merge_request/merge_quick_action_shared_examples.rb

 # frozen_string_literal: true
 
 shared_examples 'merge quick action' do
+  context 'when the current user can merge the MR' do
+    before do
+      sign_in(user)
+      visit project_merge_request_path(project, merge_request)
+    end
+
+    it 'merges the MR' do
+      add_note("/merge")
+
+      expect(page).to have_content 'Commands applied'
+
+      expect(merge_request.reload).to be_merged
+    end
+  end
+
+  context 'when the head diff changes in the meanwhile' do
+    before do
+      merge_request.source_branch = 'another_branch'
+      merge_request.save
+      sign_in(user)
+      visit project_merge_request_path(project, merge_request)
+    end
+
+    it 'does not merge the MR' do
+      add_note("/merge")
+
+      expect(page).not_to have_content 'Your commands have been executed!'
+
+      expect(merge_request.reload).not_to be_merged
+    end
+  end
+
+  context 'when the current user cannot merge the MR' do
+    before do
+      project.add_guest(guest)
+      sign_in(guest)
+      visit project_merge_request_path(project, merge_request)
+    end
+
+    it 'does not merge the MR' do
+      add_note("/merge")
+
+      expect(page).not_to have_content 'Your commands have been executed!'
+
+      expect(merge_request.reload).not_to be_merged
+    end
+  end
 end