Merge branch '54814-sidebar-styling-updates' into 'master'

Resolve "Sidebar styling updates"

Closes #54814

See merge request gitlab-org/gitlab-ce!23816

3 files changed, 10 insertions, 19 deletions

diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index 651c02c7ecc..60f37f4b74a 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -351,8 +351,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
       context 'when user is a maintainer' do
         shared_examples 'no reveal button variables behavior' do
           it 'renders a hidden value with no reveal values button', :js do
-            expect(page).to have_content('Token')
-            expect(page).to have_content('Variables')
+            expect(page).to have_content('Trigger token')
+            expect(page).to have_content('Trigger variables')
 
             expect(page).not_to have_css('.js-reveal-variables')
 
@@ -389,8 +389,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
 
         shared_examples 'reveal button variables behavior' do
           it 'renders a hidden value with a reveal values button', :js do
-            expect(page).to have_content('Token')
-            expect(page).to have_content('Variables')
+            expect(page).to have_content('Trigger token')
+            expect(page).to have_content('Trigger variables')
 
             expect(page).to have_css('.js-reveal-variables')
 
diff --git a/spec/javascripts/jobs/components/artifacts_block_spec.js b/spec/javascripts/jobs/components/artifacts_block_spec.js
index 2fa7ff653fe..27d480ef2ea 100644
--- a/spec/javascripts/jobs/components/artifacts_block_spec.js
+++ b/spec/javascripts/jobs/components/artifacts_block_spec.js
@@ -2,6 +2,7 @@ import Vue from 'vue';
 import { getTimeago } from '~/lib/utils/datetime_utility';
 import component from '~/jobs/components/artifacts_block.vue';
 import mountComponent from '../../helpers/vue_mount_component_helper';
+import { trimText } from '../../helpers/vue_component_helper';
 
 describe('Artifacts block', () => {
   const Component = Vue.extend(component);
@@ -9,7 +10,7 @@ describe('Artifacts block', () => {
 
   const expireAt = '2018-08-14T09:38:49.157Z';
   const timeago = getTimeago();
-  const formatedDate = timeago.format(expireAt);
+  const formattedDate = timeago.format(expireAt);
 
   const expiredArtifact = {
     expire_at: expireAt,
@@ -36,9 +37,8 @@ describe('Artifacts block', () => {
 
       expect(vm.$el.querySelector('.js-artifacts-removed')).not.toBeNull();
       expect(vm.$el.querySelector('.js-artifacts-will-be-removed')).toBeNull();
-      expect(vm.$el.textContent).toContain(formatedDate);
-      expect(vm.$el.querySelector('.js-artifacts-removed').textContent.trim()).toEqual(
-        'The artifacts were removed',
+      expect(trimText(vm.$el.querySelector('.js-artifacts-removed').textContent)).toEqual(
+        `The artifacts were removed ${formattedDate}`,
       );
     });
   });
@@ -51,9 +51,8 @@ describe('Artifacts block', () => {
 
       expect(vm.$el.querySelector('.js-artifacts-removed')).toBeNull();
       expect(vm.$el.querySelector('.js-artifacts-will-be-removed')).not.toBeNull();
-      expect(vm.$el.textContent).toContain(formatedDate);
-      expect(vm.$el.querySelector('.js-artifacts-will-be-removed').textContent.trim()).toEqual(
-        'The artifacts will be removed in',
+      expect(trimText(vm.$el.querySelector('.js-artifacts-will-be-removed').textContent)).toEqual(
+        `The artifacts will be removed ${formattedDate}`,
       );
     });
   });
diff --git a/spec/javascripts/jobs/components/sidebar_spec.js b/spec/javascripts/jobs/components/sidebar_spec.js
index 424092d2d88..b0bc16d7c64 100644
--- a/spec/javascripts/jobs/components/sidebar_spec.js
+++ b/spec/javascripts/jobs/components/sidebar_spec.js
@@ -79,14 +79,6 @@ describe('Sidebar details block', () => {
   });
 
   describe('information', () => {
-    it('should render merge request link', () => {
-      expect(trimText(vm.$el.querySelector('.js-job-mr').textContent)).toEqual('Merge Request: !2');
-
-      expect(vm.$el.querySelector('.js-job-mr a').getAttribute('href')).toEqual(
-        job.merge_request.path,
-      );
-    });
-
     it('should render job duration', () => {
       expect(trimText(vm.$el.querySelector('.js-job-duration').textContent)).toEqual(
         'Duration: 6 seconds',