Add serializer matchers

12 files changed, 279 insertions, 62 deletions

diff --git a/app/controllers/projects/registry/tags_controller.rb b/app/controllers/projects/registry/tags_controller.rb
index e32c5528ee7..e602aa3f393 100644
--- a/app/controllers/projects/registry/tags_controller.rb
+++ b/app/controllers/projects/registry/tags_controller.rb
@@ -15,13 +15,13 @@ module Projects
       end
 
       def destroy
-        respond_to do |format|
-          format.json do
-            if tag.delete
-              format.json { head :no_content }
-            else
-              format.json { head :bad_request }
-            end
+        if tag.delete
+          respond_to do |format|
+            format.json { head :no_content }
+          end
+        else
+          respond_to do |format|
+            format.json { head :bad_request }
           end
         end
       end
diff --git a/spec/controllers/projects/registry/repositories_controller_spec.rb b/spec/controllers/projects/registry/repositories_controller_spec.rb
index 2805968dcd9..5d9d5351687 100644
--- a/spec/controllers/projects/registry/repositories_controller_spec.rb
+++ b/spec/controllers/projects/registry/repositories_controller_spec.rb
@@ -42,6 +42,13 @@ describe Projects::Registry::RepositoriesController do
             expect { go_to_index }.to change { ContainerRepository.all.count }.by(1)
             expect(ContainerRepository.first).to be_root_repository
           end
+
+          it 'json has a list of projects' do
+            go_to_index(format: :json)
+
+            expect(response).to have_http_status(:ok)
+            expect(response).to match_response_schema('registry/repositories')
+          end
         end
 
         context 'when there are no tags for this repository' do
@@ -58,6 +65,31 @@ describe Projects::Registry::RepositoriesController do
           it 'does not ensure root container repository' do
             expect { go_to_index }.not_to change { ContainerRepository.all.count }
           end
+
+          it 'responds with json if asked' do
+            go_to_index(format: :json)
+
+            expect(response).to have_http_status(:ok)
+            expect(json_response).to be_kind_of(Array)
+          end
+        end
+      end
+    end
+
+    describe 'DELETE destroy' do
+      context 'when root container repository exists' do
+        let!(:repository) do
+          create(:container_repository, :root, project: project)
+        end
+
+        before do
+          stub_container_registry_tags(repository: :any, tags: [])
+        end
+
+        it 'deletes a repository' do
+          expect { delete_repository(repository) }.to change { ContainerRepository.all.count }.by(-1)
+
+          expect(response).to have_http_status(:no_content)
         end
       end
     end
@@ -77,8 +109,16 @@ describe Projects::Registry::RepositoriesController do
     end
   end
 
-  def go_to_index
+  def go_to_index(format: :html)
     get :index, namespace_id: project.namespace,
-                project_id: project
+                project_id: project,
+                format: format
+  end
+
+  def delete_repository(repository)
+    delete :destroy, namespace_id: project.namespace,
+                     project_id: project,
+                     id: repository,
+                     format: :json
   end
 end
diff --git a/spec/controllers/projects/registry/tags_controller_spec.rb b/spec/controllers/projects/registry/tags_controller_spec.rb
index f4af3587d23..519bfea5211 100644
--- a/spec/controllers/projects/registry/tags_controller_spec.rb
+++ b/spec/controllers/projects/registry/tags_controller_spec.rb
@@ -4,24 +4,83 @@ describe Projects::Registry::TagsController do
   let(:user)    { create(:user) }
   let(:project) { create(:project, :private) }
 
+  let(:repository) do
+    create(:container_repository, name: 'image', project: project)
+  end
+
   before do
     sign_in(user)
     stub_container_registry_config(enabled: true)
   end
 
-  context 'when user has access to registry' do
+  describe 'GET index' do
+    let(:tags) do
+      40.times.map { |i| "tag#{i}" }
+    end
+
     before do
-      project.add_developer(user)
+      stub_container_registry_tags(repository: /image/, tags: tags)
+    end
+
+    context 'when user can control the registry' do
+      before do
+        project.add_developer(user)
+      end
+
+      it 'receive a list of tags' do
+        get_tags
+
+        expect(response).to have_http_status(:ok)
+        expect(response).to match_response_schema('registry/tags')
+        expect(response).to include_pagination_headers
+      end
+    end
+
+    context 'when user can read the registry' do
+      before do
+        project.add_reporter(user)
+      end
+
+      it 'receive a list of tags' do
+        get_tags
+
+        expect(response).to have_http_status(:ok)
+        expect(response).to match_response_schema('registry/tags')
+        expect(response).to include_pagination_headers
+      end
     end
 
-    describe 'POST destroy' do
+    context 'when user does not have access to registry' do
+      before do
+        project.add_guest(user)
+      end
+
+      it 'does not receive a list of tags' do
+        get_tags
+
+        expect(response).to have_http_status(:not_found)
+      end
+    end
+
+    private
+
+    def get_tags
+      get :index, namespace_id: project.namespace,
+                    project_id: project,
+                    repository_id: repository,
+                    format: :json
+    end
+  end
+    
+  describe 'POST destroy' do
+    context 'when user has access to registry' do
+      before do
+        project.add_developer(user)
+      end
+
       context 'when there is matching tag present' do
         before do
-          stub_container_registry_tags(repository: /image/, tags: %w[rc1 test.])
-        end
-
-        let(:repository) do
-          create(:container_repository, name: 'image', project: project)
+          stub_container_registry_tags(repository: repository.path, tags: %w[rc1 test.])
         end
 
         it 'makes it possible to delete regular tag' do
@@ -37,12 +96,15 @@ describe Projects::Registry::TagsController do
         end
       end
     end
-  end
 
-  def destroy_tag(name)
-    post :destroy, namespace_id: project.namespace,
-                   project_id: project,
-                   repository_id: repository,
-                   id: name
+    private
+
+    def destroy_tag(name)
+      post :destroy, namespace_id: project.namespace,
+                    project_id: project,
+                    repository_id: repository,
+                    id: name,
+                    format: :json
+    end
   end
 end
diff --git a/spec/features/container_registry_spec.rb b/spec/features/container_registry_spec.rb
index ae39ba4da6b..ffcd0f483b9 100644
--- a/spec/features/container_registry_spec.rb
+++ b/spec/features/container_registry_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Container Registry" do
+describe "Container Registry", js: true do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
 
diff --git a/spec/fixtures/api/schemas/registry/repositories.json b/spec/fixtures/api/schemas/registry/repositories.json
new file mode 100644
index 00000000000..4978bd89cda
--- /dev/null
+++ b/spec/fixtures/api/schemas/registry/repositories.json
@@ -0,0 +1,6 @@
+{
+    "type": "array",
+    "items": {
+        "$ref": "repository.json"
+    }
+}
diff --git a/spec/fixtures/api/schemas/registry/repository.json b/spec/fixtures/api/schemas/registry/repository.json
new file mode 100644
index 00000000000..4175642eb00
--- /dev/null
+++ b/spec/fixtures/api/schemas/registry/repository.json
@@ -0,0 +1,27 @@
+{
+  "type": "object",
+  "required" : [
+    "id",
+    "path",
+    "location",
+    "tags_path"
+  ],
+  "properties" : {
+    "id": {
+      "type": "integer"
+    },
+    "path": {
+      "type": "string"
+    },
+    "location": {
+      "type": "string"
+    },
+    "tags_path": {
+      "type": "string"
+    },
+    "destroy_path": {
+      "type": "string"
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/registry/tag.json b/spec/fixtures/api/schemas/registry/tag.json
new file mode 100644
index 00000000000..5bc307e0e64
--- /dev/null
+++ b/spec/fixtures/api/schemas/registry/tag.json
@@ -0,0 +1,28 @@
+{
+  "type": "object",
+  "required" : [
+    "name",
+    "location"
+  ],
+  "properties" : {
+    "name": {
+      "type": "string"
+    },
+    "location": {
+      "type": "string"
+    },
+    "revision": {
+      "type": "string"
+    },
+    "total_size": {
+      "type": "integer"
+    },
+    "created_at": {
+      "type": "date"
+    },
+    "destroy_path": {
+      "type": "string"
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/registry/tags.json b/spec/fixtures/api/schemas/registry/tags.json
new file mode 100644
index 00000000000..c72f957459a
--- /dev/null
+++ b/spec/fixtures/api/schemas/registry/tags.json
@@ -0,0 +1,6 @@
+{
+    "type": "array",
+    "items": {
+        "$ref": "tag.json"
+    }
+}
diff --git a/spec/serializers/container_repository_entity_spec.rb b/spec/serializers/container_repository_entity_spec.rb
new file mode 100644
index 00000000000..c589cd18f77
--- /dev/null
+++ b/spec/serializers/container_repository_entity_spec.rb
@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe ContainerRepositoryEntity do
+  let(:entity) do
+    described_class.new(repository, request: request)
+  end
+
+  set(:project) { create(:project) }
+  set(:user) { create(:user) }
+  set(:repository) { create(:container_repository, project: project) }
+
+  let(:request) { double('request') }
+
+  subject { entity.as_json }
+
+  before do
+    stub_container_registry_config(enabled: true)
+    allow(request).to receive(:project).and_return(project)
+    allow(request).to receive(:current_user).and_return(user)
+  end
+
+  it 'exposes required informations'  do
+    expect(subject).to include(:id, :path, :location, :tags_path)
+  end
+
+  context 'when user can manage repositories' do
+    before do
+      project.add_developer(user)
+    end
+
+    it 'exposes destroy_path' do
+      expect(subject).to include(:destroy_path)
+    end
+  end
+
+  context 'when user cannot manage repositories' do
+    it 'does not expose destroy_path' do
+      expect(subject).not_to include(:destroy_path)
+    end
+  end
+end
diff --git a/spec/serializers/container_tag_entity_spec.rb b/spec/serializers/container_tag_entity_spec.rb
new file mode 100644
index 00000000000..6dcc5204516
--- /dev/null
+++ b/spec/serializers/container_tag_entity_spec.rb
@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe ContainerTagEntity do
+  let(:entity) do
+    described_class.new(tag, request: request)
+  end
+
+  set(:project) { create(:project) }
+  set(:user) { create(:user) }
+  set(:repository) { create(:container_repository, name: 'image', project: project) }
+
+  let(:request) { double('request') }
+  let(:tag) { repository.tag('test') }
+
+  subject { entity.as_json }
+
+  before do
+    stub_container_registry_config(enabled: true)
+    stub_container_registry_tags(repository: /image/, tags: %w[test])
+    allow(request).to receive(:project).and_return(project)
+    allow(request).to receive(:current_user).and_return(user)
+  end
+
+  it 'exposes required informations'  do
+    expect(subject).to include(:name, :location, :revision, :total_size, :created_at)
+  end
+
+  context 'when user can manage repositories' do
+    before do
+      project.add_developer(user)
+    end
+
+    it 'exposes destroy_path' do
+      expect(subject).to include(:destroy_path)
+    end
+  end
+
+  context 'when user cannot manage repositories' do
+    it 'does not expose destroy_path' do
+      expect(subject).not_to include(:destroy_path)
+    end
+  end
+end
diff --git a/spec/support/stub_gitlab_calls.rb b/spec/support/stub_gitlab_calls.rb
index 78a2ff73746..5f22d886910 100644
--- a/spec/support/stub_gitlab_calls.rb
+++ b/spec/support/stub_gitlab_calls.rb
@@ -39,11 +39,11 @@ module StubGitlabCalls
       .and_return({ 'tags' => tags })
 
     allow_any_instance_of(ContainerRegistry::Client)
-      .to receive(:repository_manifest).with(repository)
+      .to receive(:repository_manifest).with(repository, anything)
       .and_return(stub_container_registry_tag_manifest)
 
     allow_any_instance_of(ContainerRegistry::Client)
-      .to receive(:blob).with(repository)
+      .to receive(:blob).with(repository, anything, 'application/octet-stream')
       .and_return(stub_container_registry_blob)
   end
 
diff --git a/spec/views/projects/registry/repositories/index.html.haml_spec.rb b/spec/views/projects/registry/repositories/index.html.haml_spec.rb
deleted file mode 100644
index cf0aa44a4a2..00000000000
--- a/spec/views/projects/registry/repositories/index.html.haml_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'spec_helper'
-
-describe 'projects/registry/repositories/index' do
-  let(:group) { create(:group, path: 'group') }
-  let(:project) { create(:project, group: group, path: 'test') }
-
-  let(:repository) do
-    create(:container_repository, project: project, name: 'image')
-  end
-
-  before do
-    stub_container_registry_config(enabled: true,
-                                   host_port: 'registry.gitlab',
-                                   api_url: 'http://registry.gitlab')
-
-    stub_container_registry_tags(repository: :any, tags: [:latest])
-
-    assign(:project, project)
-    assign(:images, [repository])
-
-    allow(view).to receive(:can?).and_return(true)
-  end
-
-  it 'contains container repository path' do
-    render
-
-    expect(rendered).to have_content 'group/test/image'
-  end
-
-  it 'contains attribute for copying tag location into clipboard' do
-    render
-
-    expect(rendered).to have_css 'button[data-clipboard-text="docker pull ' \
-                                 'registry.gitlab/group/test/image:latest"]'
-  end
-end