Add latest changes from gitlab-org/gitlab@master

4 files changed, 19 insertions, 11 deletions

diff --git a/spec/features/issues/user_sees_empty_state_spec.rb b/spec/features/issues/user_sees_empty_state_spec.rb
index b43ba01606a..0e2a7cb4358 100644
--- a/spec/features/issues/user_sees_empty_state_spec.rb
+++ b/spec/features/issues/user_sees_empty_state_spec.rb
@@ -40,8 +40,8 @@ RSpec.describe 'Issues > User sees empty state', :js do
       it 'user sees empty state' do
         visit project_issues_path(project)
 
-        expect(page).to have_content('The Issue Tracker is the place to add things that need to be improved or solved in a project')
-        expect(page).to have_content('Issues can be bugs, tasks or ideas to be discussed. Also, issues are searchable and filterable.')
+        expect(page).to have_content('Use issues to collaborate on ideas, solve problems, and plan work')
+        expect(page).to have_content('Learn more about issues.')
         expect(page).to have_content('New issue')
       end
 
diff --git a/spec/frontend/issues/list/components/issues_list_app_spec.js b/spec/frontend/issues/list/components/issues_list_app_spec.js
index a39853fd29c..fb25ab4c28d 100644
--- a/spec/frontend/issues/list/components/issues_list_app_spec.js
+++ b/spec/frontend/issues/list/components/issues_list_app_spec.js
@@ -1,4 +1,4 @@
-import { GlButton, GlEmptyState, GlLink } from '@gitlab/ui';
+import { GlButton, GlEmptyState } from '@gitlab/ui';
 import * as Sentry from '@sentry/browser';
 import { mount, shallowMount } from '@vue/test-utils';
 import AxiosMockAdapter from 'axios-mock-adapter';
@@ -122,7 +122,6 @@ describe('CE IssuesListApp component', () => {
   const findGlButtons = () => wrapper.findAllComponents(GlButton);
   const findGlButtonAt = (index) => findGlButtons().at(index);
   const findGlEmptyState = () => wrapper.findComponent(GlEmptyState);
-  const findGlLink = () => wrapper.findComponent(GlLink);
   const findIssuableList = () => wrapper.findComponent(IssuableList);
   const findNewIssueDropdown = () => wrapper.findComponent(NewIssueDropdown);
 
@@ -562,15 +561,16 @@ describe('CE IssuesListApp component', () => {
 
         it('shows Jira integration information', () => {
           const paragraphs = wrapper.findAll('p');
-          expect(paragraphs.at(2).text()).toContain(IssuesListApp.i18n.jiraIntegrationTitle);
-          expect(paragraphs.at(3).text()).toContain(
+          const links = wrapper.findAll('.gl-link');
+          expect(paragraphs.at(1).text()).toContain(IssuesListApp.i18n.jiraIntegrationTitle);
+          expect(paragraphs.at(2).text()).toContain(
             'Enable the Jira integration to view your Jira issues in GitLab.',
           );
-          expect(paragraphs.at(4).text()).toContain(
+          expect(paragraphs.at(3).text()).toContain(
             IssuesListApp.i18n.jiraIntegrationSecondaryMessage,
           );
-          expect(findGlLink().text()).toBe('Enable the Jira integration');
-          expect(findGlLink().attributes('href')).toBe(defaultProvide.jiraIntegrationPath);
+          expect(links.at(1).text()).toBe('Enable the Jira integration');
+          expect(links.at(1).attributes('href')).toBe(defaultProvide.jiraIntegrationPath);
         });
       });
 
diff --git a/spec/frontend/vue_shared/components/gl_modal_vuex_spec.js b/spec/frontend/vue_shared/components/gl_modal_vuex_spec.js
index 2dcd91f737f..6dc018797a6 100644
--- a/spec/frontend/vue_shared/components/gl_modal_vuex_spec.js
+++ b/spec/frontend/vue_shared/components/gl_modal_vuex_spec.js
@@ -157,13 +157,13 @@ describe('GlModalVuex', () => {
 
       const handler = modalFooterSlotContent.mock.calls[0][0][handlerName];
 
-      expect(wrapper.emitted(handlerName)).toBeFalsy();
+      expect(wrapper.emitted(handlerName)).toBeUndefined();
       expect(actions.hide).not.toHaveBeenCalled();
 
       handler();
 
       expect(actions.hide).toHaveBeenCalledTimes(1);
-      expect(wrapper.emitted(handlerName)).toBeTruthy();
+      expect(wrapper.emitted(handlerName)).toHaveLength(1);
     },
   );
 });
diff --git a/spec/requests/api/ci/jobs_spec.rb b/spec/requests/api/ci/jobs_spec.rb
index d448b2db26a..b8983e9632e 100644
--- a/spec/requests/api/ci/jobs_spec.rb
+++ b/spec/requests/api/ci/jobs_spec.rb
@@ -249,6 +249,10 @@ RSpec.describe API::Ci::Jobs do
         it 'includes environment slug' do
           expect(json_response.dig('environment', 'slug')).to eq('production')
         end
+
+        it 'includes environment tier' do
+          expect(json_response.dig('environment', 'tier')).to eq('production')
+        end
       end
 
       context 'when non-deployment environment action' do
@@ -260,6 +264,10 @@ RSpec.describe API::Ci::Jobs do
         it 'includes environment slug' do
           expect(json_response.dig('environment', 'slug')).to eq('review')
         end
+
+        it 'includes environment tier' do
+          expect(json_response.dig('environment', 'tier')).to eq('development')
+        end
       end
 
       context 'when passing the token as params' do