Add latest changes from gitlab-org/gitlab@master

9 files changed, 113 insertions, 11 deletions

diff --git a/spec/controllers/repositories/git_http_controller_spec.rb b/spec/controllers/repositories/git_http_controller_spec.rb
index de14384eb6f..e565c757f95 100644
--- a/spec/controllers/repositories/git_http_controller_spec.rb
+++ b/spec/controllers/repositories/git_http_controller_spec.rb
@@ -145,13 +145,13 @@ describe Repositories::GitHttpController do
     describe 'GET #info_refs' do
       let(:params) { container_params.merge(service: 'git-upload-pack') }
 
-      it 'returns 404' do
+      it 'returns 403' do
         expect(controller).not_to receive(:access_check)
 
         get :info_refs, params: params
 
-        expect(response).to have_gitlab_http_status(:not_found)
-        expect(response.body).to eq "The project you were looking for could not be found."
+        expect(response).to have_gitlab_http_status(:forbidden)
+        expect(response.body).to eq 'Snippet git access is disabled.'
       end
     end
 
@@ -162,13 +162,13 @@ describe Repositories::GitHttpController do
         allow(controller).to receive(:access_check).and_return(nil)
       end
 
-      it 'returns 404' do
+      it 'returns 403' do
         expect(controller).not_to receive(:access_check)
 
         post :git_upload_pack, params: params
 
-        expect(response).to have_gitlab_http_status(:not_found)
-        expect(response.body).to eq "The project you were looking for could not be found."
+        expect(response).to have_gitlab_http_status(:forbidden)
+        expect(response.body).to eq 'Snippet git access is disabled.'
       end
     end
   end
diff --git a/spec/features/projects/releases/user_views_edit_release_spec.rb b/spec/features/projects/releases/user_views_edit_release_spec.rb
index 820e8277af3..217d6a25a23 100644
--- a/spec/features/projects/releases/user_views_edit_release_spec.rb
+++ b/spec/features/projects/releases/user_views_edit_release_spec.rb
@@ -40,7 +40,7 @@ describe 'User edits Release', :js do
   end
 
   it 'renders the edit Release form' do
-    expect(page).to have_content('Releases are based on Git tags. We recommend naming tags that fit within semantic versioning, for example v1.0, v2.0-pre.')
+    expect(page).to have_content('Releases are based on Git tags. We recommend tags that use semantic versioning, for example v1.0, v2.0-pre.')
 
     expect(find_field('Tag name', { disabled: true }).value).to eq(release.tag)
     expect(find_field('Release title').value).to eq(release.name)
diff --git a/spec/frontend/diffs/store/mutations_spec.js b/spec/frontend/diffs/store/mutations_spec.js
index f486a53fc4d..ad05f27b325 100644
--- a/spec/frontend/diffs/store/mutations_spec.js
+++ b/spec/frontend/diffs/store/mutations_spec.js
@@ -51,6 +51,24 @@ describe('DiffsStoreMutations', () => {
     });
   });
 
+  describe('SET_DIFF_FILES', () => {
+    it('should set diffFiles in state', () => {
+      const state = {};
+
+      mutations[types.SET_DIFF_FILES](state, ['file', 'another file']);
+
+      expect(state.diffFiles.length).toEqual(2);
+    });
+
+    it('should not set anything except diffFiles in state', () => {
+      const state = {};
+
+      mutations[types.SET_DIFF_FILES](state, ['file', 'another file']);
+
+      expect(Object.keys(state)).toEqual(['diffFiles']);
+    });
+  });
+
   describe('SET_DIFF_DATA', () => {
     it('should set diff data type properly', () => {
       const state = {
diff --git a/spec/frontend/releases/components/app_edit_spec.js b/spec/frontend/releases/components/app_edit_spec.js
index e27c27b292a..bf66f5a5183 100644
--- a/spec/frontend/releases/components/app_edit_spec.js
+++ b/spec/frontend/releases/components/app_edit_spec.js
@@ -66,7 +66,7 @@ describe('Release edit component', () => {
 
     it('renders the description text at the top of the page', () => {
       expect(wrapper.find('.js-subtitle-text').text()).toBe(
-        'Releases are based on Git tags. We recommend naming tags that fit within semantic versioning, for example v1.0, v2.0-pre.',
+        'Releases are based on Git tags. We recommend tags that use semantic versioning, for example v1.0, v2.0-pre.',
       );
     });
 
diff --git a/spec/helpers/issuables_helper_spec.rb b/spec/helpers/issuables_helper_spec.rb
index 38ad11846d2..7eb5d2fc08c 100644
--- a/spec/helpers/issuables_helper_spec.rb
+++ b/spec/helpers/issuables_helper_spec.rb
@@ -303,4 +303,46 @@ describe IssuablesHelper do
       end
     end
   end
+
+  describe '#gitlab_team_member_badge' do
+    let(:issue) { build(:issue, author: user) }
+
+    before do
+      allow(Gitlab).to receive(:com?).and_return(true)
+    end
+
+    context 'when `:gitlab_employee_badge` feature flag is disabled' do
+      let(:user) { build(:user, email: 'test@gitlab.com') }
+
+      before do
+        stub_feature_flags(gitlab_employee_badge: false)
+      end
+
+      it 'returns nil' do
+        expect(helper.gitlab_team_member_badge(issue.author)).to be_nil
+      end
+    end
+
+    context 'when issue author is not a GitLab team member' do
+      let(:user) { build(:user, email: 'test@example.com') }
+
+      it 'returns nil' do
+        expect(helper.gitlab_team_member_badge(issue.author)).to be_nil
+      end
+    end
+
+    context 'when issue author is a GitLab team member' do
+      let(:user) { build(:user, email: 'test@gitlab.com') }
+
+      it 'returns span with svg icon' do
+        expect(helper.gitlab_team_member_badge(issue.author)).to have_selector('span > svg')
+      end
+
+      context 'when `css_class` parameter is passed' do
+        it 'adds CSS classes' do
+          expect(helper.gitlab_team_member_badge(issue.author, css_class: 'foo bar baz')).to have_selector('span.foo.bar.baz')
+        end
+      end
+    end
+  end
 end
diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index c29a4dd9e00..37d9c5389dd 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -269,4 +269,18 @@ describe Gitlab::UsageData, :aggregate_failures do
 
     it_behaves_like 'usage data execution'
   end
+
+  describe '#alt_usage_data' do
+    it 'returns the fallback when it gets an error' do
+      expect(described_class.alt_usage_data { raise StandardError } ).to eq(-1)
+    end
+
+    it 'returns the evaluated block when give' do
+      expect(described_class.alt_usage_data { Gitlab::CurrentSettings.uuid } ).to eq(Gitlab::CurrentSettings.uuid)
+    end
+
+    it 'returns the value when given' do
+      expect(described_class.alt_usage_data(1)).to eq 1
+    end
+  end
 end
diff --git a/spec/requests/api/internal/base_spec.rb b/spec/requests/api/internal/base_spec.rb
index 575d695ef54..09689c5794d 100644
--- a/spec/requests/api/internal/base_spec.rb
+++ b/spec/requests/api/internal/base_spec.rb
@@ -325,12 +325,12 @@ describe API::Internal::Base do
 
       shared_examples 'snippets with disabled feature flag' do
         context 'when feature flag :version_snippets is disabled' do
-          it 'returns 404' do
+          it 'returns 401' do
             stub_feature_flags(version_snippets: false)
 
             subject
 
-            expect(response).to have_gitlab_http_status(:not_found)
+            expect(response).to have_gitlab_http_status(:unauthorized)
           end
         end
       end
diff --git a/spec/views/projects/issues/show.html.haml_spec.rb b/spec/views/projects/issues/show.html.haml_spec.rb
index add4b44e9b6..fb09840c8f4 100644
--- a/spec/views/projects/issues/show.html.haml_spec.rb
+++ b/spec/views/projects/issues/show.html.haml_spec.rb
@@ -13,7 +13,7 @@ describe 'projects/issues/show' do
     assign(:noteable, issue)
     stub_template 'shared/issuable/_sidebar' => ''
     stub_template 'projects/issues/_discussion' => ''
-    allow(view).to receive(:issuable_meta).and_return('')
+    allow(view).to receive(:user_status).and_return('')
   end
 
   context 'when the issue is closed' do
@@ -152,4 +152,18 @@ describe 'projects/issues/show' do
       expect(rendered).not_to have_selector('#js-sentry-error-stack-trace')
     end
   end
+
+  context 'when issue is created by a GitLab team member' do
+    let(:user) { create(:user, email: 'test@gitlab.com') }
+
+    before do
+      allow(Gitlab).to receive(:com?).and_return(true)
+    end
+
+    it 'renders an employee badge next to their name' do
+      render
+
+      expect(rendered).to have_selector('[aria-label="GitLab Team Member"]')
+    end
+  end
 end
diff --git a/spec/views/projects/merge_requests/show.html.haml_spec.rb b/spec/views/projects/merge_requests/show.html.haml_spec.rb
index 6023527cb28..67e7c3cf2fb 100644
--- a/spec/views/projects/merge_requests/show.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/show.html.haml_spec.rb
@@ -93,6 +93,20 @@ describe 'projects/merge_requests/show.html.haml' do
     end
   end
 
+  context 'when merge request is created by a GitLab team member' do
+    let(:user) { create(:user, email: 'test@gitlab.com') }
+
+    before do
+      allow(Gitlab).to receive(:com?).and_return(true)
+    end
+
+    it 'renders an employee badge next to their name' do
+      render
+
+      expect(rendered).to have_selector('[aria-label="GitLab Team Member"]')
+    end
+  end
+
   def serialize_issuable_sidebar(user, project, merge_request)
     MergeRequestSerializer
       .new(current_user: user, project: project)