Add latest changes from gitlab-org/gitlab@master

7 files changed, 267 insertions, 88 deletions

diff --git a/spec/features/boards/sidebar_spec.rb b/spec/features/boards/sidebar_spec.rb
index c7edb574f19..e54c11f657d 100644
--- a/spec/features/boards/sidebar_spec.rb
+++ b/spec/features/boards/sidebar_spec.rb
@@ -277,7 +277,7 @@ describe 'Issue Boards', :js do
         wait_for_requests
 
         page.within('.value') do
-          expect(page).to have_selector('.badge', count: 2)
+          expect(page).to have_selector('.gl-label-text', count: 2)
           expect(page).to have_content(development.title)
           expect(page).to have_content(stretch.title)
         end
@@ -299,7 +299,7 @@ describe 'Issue Boards', :js do
         find('.dropdown-menu-close-icon').click
 
         page.within('.value') do
-          expect(page).to have_selector('.badge', count: 3)
+          expect(page).to have_selector('.gl-label-text', count: 3)
           expect(page).to have_content(bug.title)
         end
       end
@@ -328,7 +328,7 @@ describe 'Issue Boards', :js do
         find('.dropdown-menu-close-icon').click
 
         page.within('.value') do
-          expect(page).to have_selector('.badge', count: 4)
+          expect(page).to have_selector('.gl-label-text', count: 4)
           expect(page).to have_content(bug.title)
           expect(page).to have_content(regression.title)
         end
@@ -357,13 +357,13 @@ describe 'Issue Boards', :js do
         find('.dropdown-menu-close-icon').click
 
         page.within('.value') do
-          expect(page).to have_selector('.badge', count: 1)
+          expect(page).to have_selector('.gl-label-text', count: 1)
           expect(page).not_to have_content(stretch.title)
         end
       end
 
       # 'Development' label does not show since the card is in a 'Development' list label
-      expect(card).to have_selector('.badge', count: 0)
+      expect(card).to have_selector('.gl-label-text', count: 0)
       expect(card).not_to have_content(stretch.title)
     end
 
diff --git a/spec/features/container_registry_spec.rb b/spec/features/container_registry_spec.rb
deleted file mode 100644
index 881cad1864b..00000000000
--- a/spec/features/container_registry_spec.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'Container Registry', :js do
-  let(:user) { create(:user) }
-  let(:project) { create(:project) }
-
-  let(:container_repository) do
-    create(:container_repository, name: 'my/image')
-  end
-
-  before do
-    sign_in(user)
-    project.add_developer(user)
-    stub_container_registry_config(enabled: true)
-    stub_container_registry_tags(repository: :any, tags: [])
-    stub_feature_flags(vue_container_registry_explorer: false)
-  end
-
-  it 'has a page title set' do
-    visit_container_registry
-    expect(page).to have_title(_('Container Registry'))
-  end
-
-  context 'when there are no image repositories' do
-    it 'user visits container registry main page' do
-      visit_container_registry
-
-      expect(page).to have_content 'no container images'
-    end
-  end
-
-  context 'when there are image repositories' do
-    before do
-      stub_container_registry_tags(repository: %r{my/image}, tags: %w[latest], with_manifest: true)
-      project.container_repositories << container_repository
-    end
-
-    it 'user wants to see multi-level container repository' do
-      visit_container_registry
-
-      expect(page).to have_content('my/image')
-    end
-
-    it 'user removes entire container repository', :sidekiq_might_not_need_inline do
-      visit_container_registry
-
-      expect_any_instance_of(ContainerRepository).to receive(:delete_tags!).and_return(true)
-
-      click_on(class: 'js-remove-repo')
-      expect(find('.modal .modal-title')).to have_content 'Remove repository'
-      find('.modal .modal-footer .btn-danger').click
-    end
-
-    it 'user removes a specific tag from container repository' do
-      visit_container_registry
-
-      find('.js-toggle-repo').click
-      wait_for_requests
-
-      service = double('service')
-      expect(service).to receive(:execute).with(container_repository) { { status: :success } }
-      expect(Projects::ContainerRepository::DeleteTagsService).to receive(:new).with(container_repository.project, user, tags: ['latest']) { service }
-
-      click_on(class: 'js-delete-registry-row', visible: false)
-      expect(find('.modal .modal-title')).to have_content 'Remove tag'
-      find('.modal .modal-footer .btn-danger').click
-    end
-  end
-
-  def visit_container_registry
-    visit project_container_registry_index_path(project)
-  end
-end
diff --git a/spec/features/groups/container_registry_spec.rb b/spec/features/groups/container_registry_spec.rb
new file mode 100644
index 00000000000..7e3c1728f3c
--- /dev/null
+++ b/spec/features/groups/container_registry_spec.rb
@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Container Registry', :js do
+  let(:user) { create(:user) }
+  let(:group) { create(:group) }
+  let(:project) { create(:project, namespace: group) }
+
+  let(:container_repository) do
+    create(:container_repository, name: 'my/image')
+  end
+
+  before do
+    group.add_owner(user)
+    sign_in(user)
+    stub_container_registry_config(enabled: true)
+    stub_container_registry_tags(repository: :any, tags: [])
+  end
+
+  it 'has a page title set' do
+    visit_container_registry
+
+    expect(page).to have_title _('Container Registry')
+  end
+
+  context 'when there are no image repositories' do
+    it 'list page has no container title' do
+      visit_container_registry
+
+      expect(page).to have_content _('There are no container images available in this group')
+    end
+  end
+
+  context 'when there are image repositories' do
+    before do
+      stub_container_registry_tags(repository: %r{my/image}, tags: %w[latest], with_manifest: true)
+      project.container_repositories << container_repository
+    end
+
+    it 'list page has a list of images' do
+      visit_container_registry
+
+      expect(page).to have_content 'my/image'
+    end
+
+    it 'image repository delete is disabled' do
+      visit_container_registry
+
+      delete_btn = find('[title="Remove repository"]')
+      expect(delete_btn).to be_disabled
+    end
+
+    it 'navigates to repo details' do
+      visit_container_registry_details('my/image')
+
+      expect(page).to have_content 'latest'
+    end
+
+    describe 'image repo details' do
+      before do
+        visit_container_registry_details 'my/image'
+      end
+
+      it 'shows the details breadcrumb' do
+        expect(find('.breadcrumbs')).to have_link 'my/image'
+      end
+
+      it 'shows the image title' do
+        expect(page).to have_content 'my/image tags'
+      end
+
+      it 'user removes a specific tag from container repository' do
+        service = double('service')
+        expect(service).to receive(:execute).with(container_repository) { { status: :success } }
+        expect(Projects::ContainerRepository::DeleteTagsService).to receive(:new).with(container_repository.project, user, tags: ['latest']) { service }
+
+        click_on(class: 'js-delete-registry')
+        expect(find('.modal .modal-title')).to have_content _('Remove tag')
+        find('.modal .modal-footer .btn-danger').click
+      end
+    end
+  end
+
+  def visit_container_registry
+    visit group_container_registries_path(group)
+  end
+
+  def visit_container_registry_details(name)
+    visit_container_registry
+    click_link(name)
+  end
+end
diff --git a/spec/features/issuables/issuable_list_spec.rb b/spec/features/issuables/issuable_list_spec.rb
index bcc05d313ad..7014a51ccdc 100644
--- a/spec/features/issuables/issuable_list_spec.rb
+++ b/spec/features/issuables/issuable_list_spec.rb
@@ -41,10 +41,10 @@ describe 'issuable list' do
 
       visit_issuable_list(issuable_type)
 
-      expect(all('.label-link')[0].text).to have_content('B')
-      expect(all('.label-link')[1].text).to have_content('X')
-      expect(all('.label-link')[2].text).to have_content('a')
-      expect(all('.label-link')[3].text).to have_content('z')
+      expect(all('.gl-label-text')[0].text).to have_content('B')
+      expect(all('.gl-label-text')[1].text).to have_content('X')
+      expect(all('.gl-label-text')[2].text).to have_content('a')
+      expect(all('.gl-label-text')[3].text).to have_content('z')
     end
   end
 
diff --git a/spec/features/issues/filtered_search/filter_issues_spec.rb b/spec/features/issues/filtered_search/filter_issues_spec.rb
index ee5773f1484..a518831ea2b 100644
--- a/spec/features/issues/filtered_search/filter_issues_spec.rb
+++ b/spec/features/issues/filtered_search/filter_issues_spec.rb
@@ -332,7 +332,7 @@ describe 'Filter issues', :js do
 
     context 'issue label clicked' do
       it 'filters and displays in search bar' do
-        find('.issues-list .issue .issuable-main-info .issuable-info a .badge', text: multiple_words_label.title).click
+        find('.issues-list .issue .issuable-main-info .issuable-info a .gl-label-text', text: multiple_words_label.title).click
 
         expect_issues_list_count(1)
         expect_tokens([label_token("\"#{multiple_words_label.title}\"")])
diff --git a/spec/features/labels_hierarchy_spec.rb b/spec/features/labels_hierarchy_spec.rb
index c1a2e22a0c2..c66d858a019 100644
--- a/spec/features/labels_hierarchy_spec.rb
+++ b/spec/features/labels_hierarchy_spec.rb
@@ -161,9 +161,9 @@ describe 'Labels Hierarchy', :js do
       find('.btn-success').click
 
       expect(page.find('.issue-details h2.title')).to have_content('new created issue')
-      expect(page).to have_selector('span.badge', text: grandparent_group_label.title)
-      expect(page).to have_selector('span.badge', text: parent_group_label.title)
-      expect(page).to have_selector('span.badge', text: project_label_1.title)
+      expect(page).to have_selector('span.gl-label-text', text: grandparent_group_label.title)
+      expect(page).to have_selector('span.gl-label-text', text: parent_group_label.title)
+      expect(page).to have_selector('span.gl-label-text', text: project_label_1.title)
     end
   end
 
diff --git a/spec/features/projects/container_registry_spec.rb b/spec/features/projects/container_registry_spec.rb
new file mode 100644
index 00000000000..02b2d03a880
--- /dev/null
+++ b/spec/features/projects/container_registry_spec.rb
@@ -0,0 +1,161 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Container Registry', :js do
+  let(:user) { create(:user) }
+  let(:project) { create(:project) }
+
+  let(:container_repository) do
+    create(:container_repository, name: 'my/image')
+  end
+
+  before do
+    sign_in(user)
+    project.add_developer(user)
+    stub_container_registry_config(enabled: true)
+    stub_container_registry_tags(repository: :any, tags: [])
+  end
+
+  describe 'Registry explorer is off' do
+    before do
+      stub_feature_flags(vue_container_registry_explorer: false)
+    end
+
+    it 'has a page title set' do
+      visit_container_registry
+
+      expect(page).to have_title _('Container Registry')
+    end
+
+    context 'when there are no image repositories' do
+      it 'user visits container registry main page' do
+        visit_container_registry
+
+        expect(page).to have_content _('no container images')
+      end
+    end
+
+    context 'when there are image repositories' do
+      before do
+        stub_container_registry_tags(repository: %r{my/image}, tags: %w[latest], with_manifest: true)
+        project.container_repositories << container_repository
+      end
+
+      it 'user wants to see multi-level container repository' do
+        visit_container_registry
+
+        expect(page).to have_content 'my/image'
+      end
+
+      it 'user removes entire container repository', :sidekiq_might_not_need_inline do
+        visit_container_registry
+
+        expect_any_instance_of(ContainerRepository).to receive(:delete_tags!).and_return(true)
+
+        click_on(class: 'js-remove-repo')
+        expect(find('.modal .modal-title')).to have_content _('Remove repository')
+        find('.modal .modal-footer .btn-danger').click
+      end
+
+      it 'user removes a specific tag from container repository' do
+        visit_container_registry
+
+        find('.js-toggle-repo').click
+        wait_for_requests
+
+        service = double('service')
+        expect(service).to receive(:execute).with(container_repository) { { status: :success } }
+        expect(Projects::ContainerRepository::DeleteTagsService).to receive(:new).with(container_repository.project, user, tags: ['latest']) { service }
+
+        click_on(class: 'js-delete-registry-row', visible: false)
+        expect(find('.modal .modal-title')).to have_content _('Remove tag')
+        find('.modal .modal-footer .btn-danger').click
+      end
+    end
+  end
+
+  describe 'Registry explorer is on' do
+    it 'has a page title set' do
+      visit_container_registry
+
+      expect(page).to have_title _('Container Registry')
+    end
+
+    context 'when there are no image repositories' do
+      it 'list page has no container title' do
+        visit_container_registry
+
+        expect(page).to have_content _('There are no container images stored for this project')
+      end
+
+      it 'list page has quickstart' do
+        visit_container_registry
+
+        expect(page).to have_content _('Quick Start')
+      end
+    end
+
+    context 'when there are image repositories' do
+      before do
+        stub_container_registry_tags(repository: %r{my/image}, tags: %w[latest], with_manifest: true)
+        project.container_repositories << container_repository
+      end
+
+      it 'list page has a list of images' do
+        visit_container_registry
+
+        expect(page).to have_content 'my/image'
+      end
+
+      it 'user removes entire container repository', :sidekiq_might_not_need_inline do
+        visit_container_registry
+
+        expect_any_instance_of(ContainerRepository).to receive(:delete_tags!).and_return(true)
+
+        find('[title="Remove repository"]').click
+        expect(find('.modal .modal-title')).to have_content _('Remove repository')
+        find('.modal .modal-footer .btn-danger').click
+      end
+
+      it 'navigates to repo details' do
+        visit_container_registry_details('my/image')
+
+        expect(page).to have_content 'latest'
+      end
+
+      describe 'image repo details' do
+        before do
+          visit_container_registry_details 'my/image'
+        end
+
+        it 'shows the details breadcrumb' do
+          expect(find('.breadcrumbs')).to have_link 'my/image'
+        end
+
+        it 'shows the image title' do
+          expect(page).to have_content 'my/image tags'
+        end
+
+        it 'user removes a specific tag from container repository' do
+          service = double('service')
+          expect(service).to receive(:execute).with(container_repository) { { status: :success } }
+          expect(Projects::ContainerRepository::DeleteTagsService).to receive(:new).with(container_repository.project, user, tags: ['latest']) { service }
+
+          click_on(class: 'js-delete-registry')
+          expect(find('.modal .modal-title')).to have_content _('Remove tag')
+          find('.modal .modal-footer .btn-danger').click
+        end
+      end
+    end
+  end
+
+  def visit_container_registry
+    visit project_container_registry_index_path(project)
+  end
+
+  def visit_container_registry_details(name)
+    visit_container_registry
+    click_link(name)
+  end
+end