Add latest changes from gitlab-org/gitlab@master

10 files changed, 122 insertions, 198 deletions

diff --git a/spec/experiments/application_experiment_spec.rb b/spec/experiments/application_experiment_spec.rb
index 4966e508f7e..b288d074133 100644
--- a/spec/experiments/application_experiment_spec.rb
+++ b/spec/experiments/application_experiment_spec.rb
@@ -236,6 +236,11 @@ RSpec.describe ApplicationExperiment, :experiment do
         expect(subject.process_redirect_url(url)).to be_nil
       end
     end
+
+    it "generates the correct urls based on where the engine was mounted" do
+      url = Rails.application.routes.url_helpers.experiment_redirect_url(subject, url: 'https://docs.gitlab.com')
+      expect(url).to include("/-/experiment/namespaced%2Fstub:#{subject.context.key}?https://docs.gitlab.com")
+    end
   end
 
   context "when resolving variants" do
diff --git a/spec/experiments/new_project_readme_content_experiment_spec.rb b/spec/experiments/new_project_readme_content_experiment_spec.rb
index f76b8a1ded1..a6a81580a29 100644
--- a/spec/experiments/new_project_readme_content_experiment_spec.rb
+++ b/spec/experiments/new_project_readme_content_experiment_spec.rb
@@ -30,9 +30,9 @@ RSpec.describe NewProjectReadmeContentExperiment, :experiment do
     end
 
     it "renders redirect URLs" do
-      expect(markdown).to include(
-        Rails.application.routes.url_helpers.experiment_redirect_url(subject, url: initial_url)
-      )
+      url = Rails.application.routes.url_helpers.experiment_redirect_url(subject, url: initial_url)
+      expect(url).to include("/-/experiment/#{subject.to_param}?")
+      expect(markdown).to include(url)
     end
   end
 end
diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb
index cc65e5753c0..fe4c532060b 100644
--- a/spec/features/admin/admin_settings_spec.rb
+++ b/spec/features/admin/admin_settings_spec.rb
@@ -269,7 +269,10 @@ RSpec.describe 'Admin updates settings' do
     end
 
     context 'Integrations page' do
+      let(:mailgun_events_receiver_enabled) { true }
+
       before do
+        stub_feature_flags(mailgun_events_receiver: mailgun_events_receiver_enabled)
         visit general_admin_application_settings_path
       end
 
@@ -283,16 +286,26 @@ RSpec.describe 'Admin updates settings' do
         expect(current_settings.hide_third_party_offers).to be true
       end
 
-      it 'enabling Mailgun events', :aggregate_failures do
-        page.within('.as-mailgun') do
-          check 'Enable Mailgun event receiver'
-          fill_in 'Mailgun HTTP webhook signing key', with: 'MAILGUN_SIGNING_KEY'
-          click_button 'Save changes'
+      context 'when mailgun_events_receiver feature flag is enabled' do
+        it 'enabling Mailgun events', :aggregate_failures do
+          page.within('.as-mailgun') do
+            check 'Enable Mailgun event receiver'
+            fill_in 'Mailgun HTTP webhook signing key', with: 'MAILGUN_SIGNING_KEY'
+            click_button 'Save changes'
+          end
+
+          expect(page).to have_content 'Application settings saved successfully'
+          expect(current_settings.mailgun_events_enabled).to be true
+          expect(current_settings.mailgun_signing_key).to eq 'MAILGUN_SIGNING_KEY'
         end
+      end
 
-        expect(page).to have_content 'Application settings saved successfully'
-        expect(current_settings.mailgun_events_enabled).to be true
-        expect(current_settings.mailgun_signing_key).to eq 'MAILGUN_SIGNING_KEY'
+      context 'when mailgun_events_receiver feature flag is disabled' do
+        let(:mailgun_events_receiver_enabled) { false }
+
+        it 'does not have mailgun' do
+          expect(page).not_to have_selector('.as-mailgun')
+        end
       end
     end
 
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index 10162ade48b..77d126e012e 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -167,7 +167,6 @@ ProjectMember:
 - expires_at
 - ldap
 - override
-- invite_email_success
 User:
 - id
 - username
diff --git a/spec/lib/sidebars/groups/menus/ci_cd_menu_spec.rb b/spec/lib/sidebars/groups/menus/ci_cd_menu_spec.rb
new file mode 100644
index 00000000000..1ba89af1b02
--- /dev/null
+++ b/spec/lib/sidebars/groups/menus/ci_cd_menu_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Sidebars::Groups::Menus::CiCdMenu do
+  let_it_be(:owner) { create(:user) }
+  let_it_be(:root_group) do
+    build(:group, :private).tap do |g|
+      g.add_owner(owner)
+    end
+  end
+
+  let(:group) { root_group }
+  let(:user) { owner }
+  let(:context) { Sidebars::Groups::Context.new(current_user: user, container: group) }
+
+  describe 'Menu Items' do
+    subject { described_class.new(context).renderable_items.index { |e| e.item_id == item_id } }
+
+    describe 'Runners' do
+      let(:item_id) { :runners }
+
+      specify { is_expected.not_to be_nil }
+
+      describe 'when feature flag :runner_list_group_view_vue_ui is disabled' do
+        before do
+          stub_feature_flags(runner_list_group_view_vue_ui: false)
+        end
+
+        specify { is_expected.to be_nil }
+      end
+
+      describe 'when the user does not have access' do
+        let(:user) { nil }
+
+        specify { is_expected.to be_nil }
+      end
+    end
+  end
+end
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index d00260a3bcd..240abfc5c53 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -832,15 +832,15 @@ RSpec.describe Notify do
         end
       end
 
-      context 'when mailgun events are enabled' do
+      context 'when on gitlab.com' do
         before do
-          stub_application_setting(mailgun_events_enabled: true)
+          allow(Gitlab).to receive(:dev_env_or_com?).and_return(true)
         end
 
         it 'has custom headers' do
           aggregate_failures do
-            expect(subject).to have_header('X-Mailgun-Tag', ::Members::Mailgun::INVITE_EMAIL_TAG)
-            expect(subject).to have_header('X-Mailgun-Variables', { ::Members::Mailgun::INVITE_EMAIL_TOKEN_KEY => project_member.invite_token }.to_json)
+            expect(subject).to have_header('X-Mailgun-Tag', 'invite_email')
+            expect(subject).to have_header('X-Mailgun-Variables', { 'invite_token' => project_member.invite_token }.to_json)
           end
         end
       end
diff --git a/spec/requests/api/user_counts_spec.rb b/spec/requests/api/user_counts_spec.rb
index 94e25d647fc..ab2aa87d1b7 100644
--- a/spec/requests/api/user_counts_spec.rb
+++ b/spec/requests/api/user_counts_spec.rb
@@ -3,8 +3,10 @@
 require 'spec_helper'
 
 RSpec.describe API::UserCounts do
-  let(:user) { create(:user) }
-  let(:project) { create(:project, :public) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project, :public) }
+  let_it_be(:issue) { create(:issue, project: project, author: user, assignees: [user]) }
+  let_it_be(:todo) { create(:todo, :pending, user: user, project: project) }
 
   let!(:merge_request) { create(:merge_request, :simple, author: user, assignees: [user], source_project: project, title: "Test") }
 
@@ -18,22 +20,36 @@ RSpec.describe API::UserCounts do
     end
 
     context 'when authenticated' do
-      it 'returns open counts for current user' do
+      it 'returns assigned issue counts for current_user' do
         get api('/user_counts', user)
 
-        expect(response).to have_gitlab_http_status(:ok)
-        expect(json_response).to be_a Hash
-        expect(json_response['merge_requests']).to eq(1)
+        expect(json_response['assigned_issues']).to eq(1)
       end
 
-      it 'updates the mr count when a new mr is assigned' do
-        create(:merge_request, source_project: project, author: user, assignees: [user])
+      context 'merge requests' do
+        it 'returns assigned MR counts for current user' do
+          get api('/user_counts', user)
 
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(json_response).to be_a Hash
+          expect(json_response['merge_requests']).to eq(1)
+        end
+
+        it 'updates the mr count when a new mr is assigned' do
+          create(:merge_request, source_project: project, author: user, assignees: [user])
+
+          get api('/user_counts', user)
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(json_response).to be_a Hash
+          expect(json_response['merge_requests']).to eq(2)
+        end
+      end
+
+      it 'returns pending todo counts for current_user' do
         get api('/user_counts', user)
 
-        expect(response).to have_gitlab_http_status(:ok)
-        expect(json_response).to be_a Hash
-        expect(json_response['merge_requests']).to eq(2)
+        expect(json_response['todos']).to eq(1)
       end
     end
   end
diff --git a/spec/requests/members/mailgun/permanent_failure_spec.rb b/spec/requests/members/mailgun/permanent_failure_spec.rb
deleted file mode 100644
index e47aedf8e94..00000000000
--- a/spec/requests/members/mailgun/permanent_failure_spec.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe 'receive a permanent failure' do
-  describe 'POST /members/mailgun/permanent_failures', :aggregate_failures do
-    let_it_be(:member) { create(:project_member, :invited) }
-
-    let(:raw_invite_token) { member.raw_invite_token }
-    let(:mailgun_events) { true }
-    let(:mailgun_signing_key) { 'abc123' }
-
-    subject(:post_request) { post members_mailgun_permanent_failures_path(standard_params) }
-
-    before do
-      stub_application_setting(mailgun_events_enabled: mailgun_events, mailgun_signing_key: mailgun_signing_key)
-    end
-
-    it 'marks the member invite email success as false' do
-      expect { post_request }.to change { member.reload.invite_email_success }.from(true).to(false)
-
-      expect(response).to have_gitlab_http_status(:ok)
-    end
-
-    context 'when the change to a member is not made' do
-      context 'with incorrect signing key' do
-        context 'with incorrect signing key' do
-          let(:mailgun_signing_key) { '_foobar_' }
-
-          it 'does not change member status and responds as not_found' do
-            expect { post_request }.not_to change { member.reload.invite_email_success }
-
-            expect(response).to have_gitlab_http_status(:not_found)
-          end
-        end
-
-        context 'with nil signing key' do
-          let(:mailgun_signing_key) { nil }
-
-          it 'does not change member status and responds as not_found' do
-            expect { post_request }.not_to change { member.reload.invite_email_success }
-
-            expect(response).to have_gitlab_http_status(:not_found)
-          end
-        end
-      end
-
-      context 'when the feature is not enabled' do
-        let(:mailgun_events) { false }
-
-        it 'does not change member status and responds as expected' do
-          expect { post_request }.not_to change { member.reload.invite_email_success }
-
-          expect(response).to have_gitlab_http_status(:not_acceptable)
-        end
-      end
-
-      context 'when it is not an invite email' do
-        before do
-          stub_const('::Members::Mailgun::INVITE_EMAIL_TAG', '_foobar_')
-        end
-
-        it 'does not change member status and responds as expected' do
-          expect { post_request }.not_to change { member.reload.invite_email_success }
-
-          expect(response).to have_gitlab_http_status(:not_acceptable)
-        end
-      end
-    end
-
-    def standard_params
-      {
-        "signature": {
-          "timestamp": "1625056677",
-          "token": "eb944d0ace7227667a1b97d2d07276ae51d2b849ed2cfa68f3",
-          "signature": "9790cc6686eb70f0b1f869180d906870cdfd496d27fee81da0aa86b9e539e790"
-        },
-        "event-data": {
-          "severity": "permanent",
-          "tags": ["invite_email"],
-          "timestamp": 1521233195.375624,
-          "storage": {
-            "url": "_anything_",
-            "key": "_anything_"
-          },
-          "log-level": "error",
-          "id": "_anything_",
-          "campaigns": [],
-          "reason": "suppress-bounce",
-          "user-variables": {
-            "invite_token": raw_invite_token
-          },
-          "flags": {
-            "is-routed": false,
-            "is-authenticated": true,
-            "is-system-test": false,
-            "is-test-mode": false
-          },
-          "recipient-domain": "example.com",
-          "envelope": {
-            "sender": "bob@mg.gitlab.com",
-            "transport": "smtp",
-            "targets": "alice@example.com"
-          },
-          "message": {
-            "headers": {
-              "to": "Alice <alice@example.com>",
-              "message-id": "20130503192659.13651.20287@mg.gitlab.com",
-              "from": "Bob <bob@mg.gitlab.com>",
-              "subject": "Test permanent_fail webhook"
-            },
-            "attachments": [],
-            "size": 111
-          },
-          "recipient": "alice@example.com",
-          "event": "failed",
-          "delivery-status": {
-            "attempt-no": 1,
-            "message": "",
-            "code": 605,
-            "description": "Not delivering to previously bounced address",
-            "session-seconds": 0
-          }
-        }
-      }
-    end
-  end
-end
diff --git a/spec/services/members/mailgun/process_webhook_service_spec.rb b/spec/services/members/mailgun/process_webhook_service_spec.rb
deleted file mode 100644
index d6a21183395..00000000000
--- a/spec/services/members/mailgun/process_webhook_service_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Members::Mailgun::ProcessWebhookService do
-  describe '#execute', :aggregate_failures do
-    let_it_be(:member) { create(:project_member, :invited) }
-
-    let(:raw_invite_token) { member.raw_invite_token }
-    let(:payload) { { 'user-variables' => { ::Members::Mailgun::INVITE_EMAIL_TOKEN_KEY => raw_invite_token } } }
-
-    subject(:service) { described_class.new(payload).execute }
-
-    it 'marks the member invite email success as false' do
-      expect(Gitlab::AppLogger).to receive(:info).with(/^UPDATED MEMBER INVITE_EMAIL_SUCCESS/).and_call_original
-
-      expect { service }.to change { member.reload.invite_email_success }.from(true).to(false)
-    end
-
-    context 'when member can not be found' do
-      let(:raw_invite_token) { '_foobar_' }
-
-      it 'does not change member status' do
-        expect(Gitlab::AppLogger).not_to receive(:info).with(/^UPDATED MEMBER INVITE_EMAIL_SUCCESS/)
-
-        expect { service }.not_to change { member.reload.invite_email_success }
-      end
-    end
-
-    context 'when invite token is not found in payload' do
-      let(:payload) { {} }
-
-      it 'does not change member status and logs an error' do
-        expect(Gitlab::AppLogger).not_to receive(:info).with(/^UPDATED MEMBER INVITE_EMAIL_SUCCESS/)
-        expect(Gitlab::ErrorTracking).to receive(:track_exception).with(
-          an_instance_of(described_class::ProcessWebhookServiceError))
-
-        expect { service }.not_to change { member.reload.invite_email_success }
-      end
-    end
-  end
-end
diff --git a/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb
index c00c3efe6d6..fc62fbda2cc 100644
--- a/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb
+++ b/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb
@@ -3,10 +3,17 @@
 require 'spec_helper'
 
 RSpec.describe 'layouts/nav/sidebar/_group' do
-  let_it_be(:group) { create(:group) }
+  let_it_be(:owner) { create(:user) }
+  let_it_be(:group) do
+    create(:group).tap do |g|
+      g.add_owner(owner)
+    end
+  end
 
   before do
     assign(:group, group)
+
+    allow(view).to receive(:current_user).and_return(owner)
   end
 
   it_behaves_like 'has nav sidebar'
@@ -79,4 +86,18 @@ RSpec.describe 'layouts/nav/sidebar/_group' do
       expect(rendered).to have_css('span.badge.badge-pill.merge_counter.js-merge-counter')
     end
   end
+
+  describe 'CI/CD' do
+    it 'has a default link to the runners list path' do
+      render
+
+      expect(rendered).to have_link('CI/CD', href: group_runners_path(group))
+    end
+
+    it 'has a link to the runners list page' do
+      render
+
+      expect(rendered).to have_link('Runners', href: group_runners_path(group))
+    end
+  end
 end