Add latest changes from gitlab-org/gitlab@12-10-stable-ee

2 files changed, 28 insertions, 13 deletions

diff --git a/spec/features/groups/settings/ci_cd_spec.rb b/spec/features/groups/settings/ci_cd_spec.rb
index 3fbc7c7a695..5b1a9512c55 100644
--- a/spec/features/groups/settings/ci_cd_spec.rb
+++ b/spec/features/groups/settings/ci_cd_spec.rb
@@ -37,19 +37,6 @@ describe 'Group CI/CD settings' do
     end
   end
 
-  context 'Deploy tokens' do
-    let!(:deploy_token) { create(:deploy_token, :group, groups: [group]) }
-
-    before do
-      stub_container_registry_config(enabled: true)
-      visit group_settings_ci_cd_path(group)
-    end
-
-    it_behaves_like 'a deploy token in ci/cd settings' do
-      let(:entity_type) { 'group' }
-    end
-  end
-
   describe 'Auto DevOps form' do
     before do
       stub_application_setting(auto_devops_enabled: true)
diff --git a/spec/features/groups/settings/repository_spec.rb b/spec/features/groups/settings/repository_spec.rb
new file mode 100644
index 00000000000..722fd98ce59
--- /dev/null
+++ b/spec/features/groups/settings/repository_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Group Repository settings' do
+  include WaitForRequests
+
+  let(:user) { create(:user) }
+  let(:group) { create(:group) }
+
+  before do
+    group.add_owner(user)
+    sign_in(user)
+  end
+
+  context 'Deploy tokens' do
+    let!(:deploy_token) { create(:deploy_token, :group, groups: [group]) }
+
+    before do
+      stub_container_registry_config(enabled: true)
+      visit group_settings_repository_path(group)
+    end
+
+    it_behaves_like 'a deploy token in settings' do
+      let(:entity_type) { 'group' }
+    end
+  end
+end