Add latest changes from gitlab-org/gitlab@master

1 files changed, 66 insertions, 126 deletions

diff --git a/spec/features/projects/container_registry_spec.rb b/spec/features/projects/container_registry_spec.rb
index 76c28c17858..a75da5f1080 100644
--- a/spec/features/projects/container_registry_spec.rb
+++ b/spec/features/projects/container_registry_spec.rb
@@ -17,167 +17,107 @@ describe 'Container Registry', :js do
     stub_container_registry_tags(repository: :any, tags: [])
   end
 
-  describe 'Registry explorer is off' do
-    before do
-      stub_feature_flags(vue_container_registry_explorer: { enabled: false, thing: project.group })
-    end
+  it 'has a page title set' do
+    visit_container_registry
+
+    expect(page).to have_title _('Container Registry')
+  end
 
-    it 'has a page title set' do
+  context 'when there are no image repositories' do
+    it 'list page has no container title' do
       visit_container_registry
 
-      expect(page).to have_title _('Container Registry')
+      expect(page).to have_content _('There are no container images stored for this project')
     end
 
-    context 'when there are no image repositories' do
-      it 'user visits container registry main page' do
-        visit_container_registry
+    it 'list page has quickstart' do
+      visit_container_registry
 
-        expect(page).to have_content _('no container images')
-      end
+      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 '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
+  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
-  end
 
-  describe 'Registry explorer is on' do
-    it 'has a page title set' do
+    it 'list page has a list of images' do
       visit_container_registry
 
-      expect(page).to have_title _('Container Registry')
+      expect(page).to have_content 'my/image'
     end
 
-    context 'when there are no image repositories' do
-      it 'list page has no container title' do
-        visit_container_registry
+    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)
 
-        expect(page).to have_content _('There are no container images stored for this project')
-      end
+      find('[title="Remove repository"]').click
+      expect(find('.modal .modal-title')).to have_content _('Remove repository')
+      find('.modal .modal-footer .btn-danger').click
+    end
 
-      it 'list page has quickstart' do
-        visit_container_registry
+    it 'navigates to repo details' do
+      visit_container_registry_details('my/image')
 
-        expect(page).to have_content _('Quick Start')
-      end
+      expect(page).to have_content 'latest'
     end
 
-    context 'when there are image repositories' do
+    describe 'image repo details' do
       before do
-        stub_container_registry_tags(repository: %r{my/image}, tags: %w[latest], with_manifest: true)
-        project.container_repositories << container_repository
+        stub_container_registry_tags(repository: %r{my/image}, tags: ('1'..'20').to_a, with_manifest: true)
+        visit_container_registry_details 'my/image'
       end
 
-      it 'list page has a list of images' do
-        visit_container_registry
-
-        expect(page).to have_content 'my/image'
+      it 'shows the details breadcrumb' do
+        expect(find('.breadcrumbs')).to have_link '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
+      it 'shows the image title' do
+        expect(page).to have_content 'my/image tags'
       end
 
-      it 'navigates to repo details' do
-        visit_container_registry_details('my/image')
+      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: ['1']) { service }
 
-        expect(page).to have_content 'latest'
+        first('.js-delete-registry').click
+        expect(find('.modal .modal-title')).to have_content _('Remove tag')
+        find('.modal .modal-footer .btn-danger').click
       end
 
-      describe 'image repo details' do
-        before do
-          stub_container_registry_tags(repository: %r{my/image}, tags: ('1'..'20').to_a, with_manifest: true)
-          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: ['1']) { service }
-
-          first('.js-delete-registry').click
-          expect(find('.modal .modal-title')).to have_content _('Remove tag')
-          find('.modal .modal-footer .btn-danger').click
-        end
-
-        it('pagination navigate to the second page') do
-          visit_second_page
-          expect(page).to have_content '20'
-        end
+      it('pagination navigate to the second page') do
+        visit_second_page
+        expect(page).to have_content '20'
       end
     end
+  end
 
-    context 'when there are more than 10 images' do
-      before do
-        create_list(:container_repository, 12, project: project)
-        project.container_repositories << container_repository
-        visit_container_registry
-      end
+  context 'when there are more than 10 images' do
+    before do
+      create_list(:container_repository, 12, project: project)
+      project.container_repositories << container_repository
+      visit_container_registry
+    end
 
-      it 'shows pagination' do
-        expect(page).to have_css '.gl-pagination'
-      end
+    it 'shows pagination' do
+      expect(page).to have_css '.gl-pagination'
+    end
 
-      it 'pagination goes to second page' do
-        visit_second_page
-        expect(page).to have_content 'my/image'
-      end
+    it 'pagination goes to second page' do
+      visit_second_page
+      expect(page).to have_content 'my/image'
+    end
 
-      it 'pagination is preserved after navigating back from details' do
-        visit_second_page
-        click_link 'my/image'
-        breadcrumb = find '.breadcrumbs'
-        breadcrumb.click_link 'Container Registry'
-        expect(page).to have_content 'my/image'
-      end
+    it 'pagination is preserved after navigating back from details' do
+      visit_second_page
+      click_link 'my/image'
+      breadcrumb = find '.breadcrumbs'
+      breadcrumb.click_link 'Container Registry'
+      expect(page).to have_content 'my/image'
     end
   end