Add latest changes from gitlab-org/gitlab@master

2 files changed, 71 insertions, 74 deletions

diff --git a/spec/controllers/projects/logs_controller_spec.rb b/spec/controllers/projects/logs_controller_spec.rb
index cc0690788c7..e86a42b03c8 100644
--- a/spec/controllers/projects/logs_controller_spec.rb
+++ b/spec/controllers/projects/logs_controller_spec.rb
@@ -16,16 +16,23 @@ describe Projects::LogsController do
   let(:container) { 'container-1' }
 
   before do
-    project.add_maintainer(user)
-
     sign_in(user)
   end
 
   describe 'GET #index' do
     let(:empty_project) { create(:project) }
 
+    it 'returns 404 with developer access' do
+      project.add_developer(user)
+
+      get :index, params: environment_params
+
+      expect(response).to have_gitlab_http_status(:not_found)
+    end
+
     it 'renders empty logs page if no environment exists' do
       empty_project.add_maintainer(user)
+
       get :index, params: { namespace_id: empty_project.namespace, project_id: empty_project }
 
       expect(response).to be_ok
@@ -33,6 +40,8 @@ describe Projects::LogsController do
     end
 
     it 'renders index template' do
+      project.add_maintainer(user)
+
       get :index, params: environment_params
 
       expect(response).to be_ok
@@ -60,70 +69,84 @@ describe Projects::LogsController do
       end
     end
 
-    it 'returns the service result' do
+    it 'returns 404 with developer access' do
+      project.add_developer(user)
+
       get endpoint, params: environment_params(pod_name: pod_name, format: :json)
 
-      expect(response).to have_gitlab_http_status(:success)
-      expect(json_response).to eq(service_result_json)
+      expect(response).to have_gitlab_http_status(:not_found)
     end
 
-    it 'registers a usage of the endpoint' do
-      expect(::Gitlab::UsageCounters::PodLogs).to receive(:increment).with(project.id)
+    context 'with maintainer access' do
+      before do
+        project.add_maintainer(user)
+      end
 
-      get endpoint, params: environment_params(pod_name: pod_name, format: :json)
+      it 'returns the service result' do
+        get endpoint, params: environment_params(pod_name: pod_name, format: :json)
 
-      expect(response).to have_gitlab_http_status(:success)
-    end
+        expect(response).to have_gitlab_http_status(:success)
+        expect(json_response).to eq(service_result_json)
+      end
 
-    it 'sets the polling header' do
-      get endpoint, params: environment_params(pod_name: pod_name, format: :json)
+      it 'registers a usage of the endpoint' do
+        expect(::Gitlab::UsageCounters::PodLogs).to receive(:increment).with(project.id)
 
-      expect(response).to have_gitlab_http_status(:success)
-      expect(response.headers['Poll-Interval']).to eq('3000')
-    end
+        get endpoint, params: environment_params(pod_name: pod_name, format: :json)
 
-    context 'when service is processing' do
-      let(:service_result) { nil }
+        expect(response).to have_gitlab_http_status(:success)
+      end
 
-      it 'returns a 202' do
+      it 'sets the polling header' do
         get endpoint, params: environment_params(pod_name: pod_name, format: :json)
 
-        expect(response).to have_gitlab_http_status(:accepted)
+        expect(response).to have_gitlab_http_status(:success)
+        expect(response.headers['Poll-Interval']).to eq('3000')
       end
-    end
 
-    shared_examples 'unsuccessful execution response' do |message|
-      let(:service_result) do
-        {
-          status: :error,
-          message: message
-        }
-      end
+      context 'when service is processing' do
+        let(:service_result) { nil }
 
-      it 'returns the error' do
-        get endpoint, params: environment_params(pod_name: pod_name, format: :json)
+        it 'returns a 202' do
+          get endpoint, params: environment_params(pod_name: pod_name, format: :json)
 
-        expect(response).to have_gitlab_http_status(:bad_request)
-        expect(json_response).to eq(service_result_json)
+          expect(response).to have_gitlab_http_status(:accepted)
+        end
       end
-    end
 
-    context 'when service is failing' do
-      it_behaves_like 'unsuccessful execution response', 'some error'
-    end
+      shared_examples 'unsuccessful execution response' do |message|
+        let(:service_result) do
+          {
+            status: :error,
+            message: message
+          }
+        end
 
-    context 'when cluster is nil' do
-      let!(:cluster) { nil }
+        it 'returns the error' do
+          get endpoint, params: environment_params(pod_name: pod_name, format: :json)
 
-      it_behaves_like 'unsuccessful execution response', 'Environment does not have deployments'
-    end
+          expect(response).to have_gitlab_http_status(:bad_request)
+          expect(json_response).to eq(service_result_json)
+        end
+      end
 
-    context 'when namespace is empty' do
-      before do
-        allow(environment).to receive(:deployment_namespace).and_return('')
+      context 'when service is failing' do
+        it_behaves_like 'unsuccessful execution response', 'some error'
+      end
+
+      context 'when cluster is nil' do
+        let!(:cluster) { nil }
+
+        it_behaves_like 'unsuccessful execution response', 'Environment does not have deployments'
       end
 
-      it_behaves_like 'unsuccessful execution response', 'Environment does not have deployments'
+      context 'when namespace is empty' do
+        before do
+          allow(environment).to receive(:deployment_namespace).and_return('')
+        end
+
+        it_behaves_like 'unsuccessful execution response', 'Environment does not have deployments'
+      end
     end
   end
 
diff --git a/spec/controllers/snippets_controller_spec.rb b/spec/controllers/snippets_controller_spec.rb
index aea0e4a097b..046ee40cec2 100644
--- a/spec/controllers/snippets_controller_spec.rb
+++ b/spec/controllers/snippets_controller_spec.rb
@@ -243,39 +243,13 @@ describe SnippetsController do
       end
     end
 
-    context 'when the snippet description contains a file' do
-      include FileMoverHelpers
+    context 'when the controller receives the files param' do
+      let(:files) { %w(foo bar) }
 
-      let(:picture_secret) { SecureRandom.hex }
-      let(:text_secret) { SecureRandom.hex }
-      let(:picture_file) { "/-/system/user/#{user.id}/#{picture_secret}/picture.jpg" }
-      let(:text_file) { "/-/system/user/#{user.id}/#{text_secret}/text.txt" }
-      let(:description) do
-        "Description with picture: ![picture](/uploads#{picture_file}) and "\
-        "text: [text.txt](/uploads#{text_file})"
-      end
-
-      before do
-        allow(FileUtils).to receive(:mkdir_p)
-        allow(FileUtils).to receive(:move)
-        stub_file_mover(text_file)
-        stub_file_mover(picture_file)
-      end
-
-      subject { create_snippet({ description: description }, { files: [picture_file, text_file] }) }
-
-      it 'creates the snippet' do
-        expect { subject }.to change { Snippet.count }.by(1)
-      end
-
-      it 'stores the snippet description correctly' do
-        snippet = subject
-
-        expected_description = "Description with picture: "\
-          "![picture](/uploads/-/system/personal_snippet/#{snippet.id}/#{picture_secret}/picture.jpg) and "\
-          "text: [text.txt](/uploads/-/system/personal_snippet/#{snippet.id}/#{text_secret}/text.txt)"
+      it 'passes the files param to the snippet create service' do
+        expect(Snippets::CreateService).to receive(:new).with(nil, user, hash_including(files: files)).and_call_original
 
-        expect(snippet.description).to eq(expected_description)
+        create_snippet({ title: nil }, { files: files })
       end
     end