Merge remote-tracking branch 'upstream/master' into show-commit-status-from-latest-pipeline

* upstream/master: (557 commits)
  Fix wrong error message expectation in API::Commits spec
  Move admin settings spinach feature to rspec
  Encode when migrating ProcessCommitWorker jobs
  Prevent overflow with vertical scroll when we have space to show content
  Make rubocop happy
  API: Ability to cherry-pick a commit
  Be smarter when finding a sudoed user in API::Helpers
  Backport hooks on group policies for the EE-specific implementation
  API: Ability to get group's project in simple representation
  Add AddLowerPathIndexToRoutes to setup_postgresql.rake
  For single line git commit messages, the close quote should be on the same line as the open quote
  added border-radius and padding to labels
  Allow all alphanumeric characters in file names (!8002)
  Add failing test for #20190
  Don't allow blank MR titles in API
  Replace static fixture for awards_handler_spec (!7661)
  Crontab typo '* */6' -> '0 */6' (4x/day not 1x-per-min-for-1h 4x/day)
  Fix test
  Tweak style and add back wording
  Clean up commit copy to clipboard and make consistent
  ...

1 files changed, 136 insertions, 143 deletions

diff --git a/spec/javascripts/build_spec.js.es6 b/spec/javascripts/build_spec.js.es6
index 4208e076e96..3983cad4c13 100644
--- a/spec/javascripts/build_spec.js.es6
+++ b/spec/javascripts/build_spec.js.es6
@@ -8,184 +8,177 @@
 //= require jquery.nicescroll
 //= require turbolinks
 
-(() => {
-  describe('Build', () => {
-    fixture.preload('build.html');
+describe('Build', () => {
+  const BUILD_URL = `${gl.TEST_HOST}/frontend-fixtures/builds-project/builds/1`;
+  // see spec/factories/ci/builds.rb
+  const BUILD_TRACE = 'BUILD TRACE';
+  // see lib/ci/ansi2html.rb
+  const INITIAL_BUILD_TRACE_STATE = window.btoa(JSON.stringify({
+    offset: BUILD_TRACE.length, n_open_tags: 0, fg_color: null, bg_color: null, style_mask: 0,
+  }));
+
+  fixture.preload('builds/build-with-artifacts.html.raw');
+
+  beforeEach(() => {
+    fixture.load('builds/build-with-artifacts.html.raw');
+    spyOn($, 'ajax');
+  });
+
+  describe('constructor', () => {
+    beforeEach(() => {
+      jasmine.clock().install();
+    });
 
-    beforeEach(function () {
-      fixture.load('build.html');
-      spyOn($, 'ajax');
+    afterEach(() => {
+      jasmine.clock().uninstall();
     });
 
-    describe('constructor', () => {
+    describe('setup', () => {
       beforeEach(function () {
-        jasmine.clock().install();
+        this.build = new Build();
       });
 
-      afterEach(() => {
-        jasmine.clock().uninstall();
+      it('copies build options', function () {
+        expect(this.build.pageUrl).toBe(BUILD_URL);
+        expect(this.build.buildUrl).toBe(`${BUILD_URL}.json`);
+        expect(this.build.buildStatus).toBe('success');
+        expect(this.build.buildStage).toBe('test');
+        expect(this.build.state).toBe(INITIAL_BUILD_TRACE_STATE);
       });
 
-      describe('setup', function () {
-        const removeDate = new Date();
-        removeDate.setUTCFullYear(removeDate.getUTCFullYear() + 1);
-        // give the test three days to run
-        removeDate.setTime(removeDate.getTime() + (3 * 24 * 60 * 60 * 1000));
+      it('only shows the jobs matching the current stage', () => {
+        expect($('.build-job[data-stage="build"]').is(':visible')).toBe(false);
+        expect($('.build-job[data-stage="test"]').is(':visible')).toBe(true);
+        expect($('.build-job[data-stage="deploy"]').is(':visible')).toBe(false);
+      });
 
-        beforeEach(function () {
-          const removeDateElement = document.querySelector('.js-artifacts-remove');
-          removeDateElement.innerText = removeDate.toString();
+      it('selects the current stage in the build dropdown menu', () => {
+        expect($('.stage-selection').text()).toBe('test');
+      });
 
-          this.build = new Build();
-        });
+      it('updates the jobs when the build dropdown changes', () => {
+        $('.stage-item:contains("build")').click();
 
-        it('copies build options', function () {
-          expect(this.build.pageUrl).toBe('http://example.com/root/test-build/builds/2');
-          expect(this.build.buildUrl).toBe('http://example.com/root/test-build/builds/2.json');
-          expect(this.build.buildStatus).toBe('passed');
-          expect(this.build.buildStage).toBe('test');
-          expect(this.build.state).toBe('buildstate');
-        });
+        expect($('.stage-selection').text()).toBe('build');
+        expect($('.build-job[data-stage="build"]').is(':visible')).toBe(true);
+        expect($('.build-job[data-stage="test"]').is(':visible')).toBe(false);
+        expect($('.build-job[data-stage="deploy"]').is(':visible')).toBe(false);
+      });
 
-        it('only shows the jobs matching the current stage', function () {
-          expect($('.build-job[data-stage="build"]').is(':visible')).toBe(false);
-          expect($('.build-job[data-stage="test"]').is(':visible')).toBe(true);
-          expect($('.build-job[data-stage="deploy"]').is(':visible')).toBe(false);
-        });
+      it('displays the remove date correctly', () => {
+        const removeDateElement = document.querySelector('.js-artifacts-remove');
+        expect(removeDateElement.innerText.trim()).toBe('1 year');
+      });
+    });
 
-        it('selects the current stage in the build dropdown menu', function () {
-          expect($('.stage-selection').text()).toBe('test');
-        });
+    describe('initial build trace', () => {
+      beforeEach(() => {
+        new Build();
+      });
 
-        it('updates the jobs when the build dropdown changes', function () {
-          $('.stage-item:contains("build")').click();
+      it('displays the initial build trace', () => {
+        expect($.ajax.calls.count()).toBe(1);
+        const [{ url, dataType, success, context }] = $.ajax.calls.argsFor(0);
+        expect(url).toBe(`${BUILD_URL}.json`);
+        expect(dataType).toBe('json');
+        expect(success).toEqual(jasmine.any(Function));
 
-          expect($('.stage-selection').text()).toBe('build');
-          expect($('.build-job[data-stage="build"]').is(':visible')).toBe(true);
-          expect($('.build-job[data-stage="test"]').is(':visible')).toBe(false);
-          expect($('.build-job[data-stage="deploy"]').is(':visible')).toBe(false);
-        });
+        success.call(context, { trace_html: '<span>Example</span>', status: 'running' });
 
-        it('displays the remove date correctly', function () {
-          const removeDateElement = document.querySelector('.js-artifacts-remove');
-          expect(removeDateElement.innerText.trim()).toBe('1 year');
-        });
+        expect($('#build-trace .js-build-output').text()).toMatch(/Example/);
       });
 
-      describe('initial build trace', function () {
-        beforeEach(function () {
-          new Build();
-        });
+      it('removes the spinner', () => {
+        const [{ success, context }] = $.ajax.calls.argsFor(0);
+        success.call(context, { trace_html: '<span>Example</span>', status: 'success' });
 
-        it('displays the initial build trace', function () {
-          expect($.ajax.calls.count()).toBe(1);
-          const [{ url, dataType, success, context }] = $.ajax.calls.argsFor(0);
-          expect(url).toBe('http://example.com/root/test-build/builds/2.json');
-          expect(dataType).toBe('json');
-          expect(success).toEqual(jasmine.any(Function));
+        expect($('.js-build-refresh').length).toBe(0);
+      });
+    });
 
-          success.call(context, { trace_html: '<span>Example</span>', status: 'running' });
+    describe('running build', () => {
+      beforeEach(function () {
+        $('.js-build-options').data('buildStatus', 'running');
+        this.build = new Build();
+        spyOn(this.build, 'location').and.returnValue(BUILD_URL);
+      });
 
-          expect($('#build-trace .js-build-output').text()).toMatch(/Example/);
+      it('updates the build trace on an interval', function () {
+        jasmine.clock().tick(4001);
+
+        expect($.ajax.calls.count()).toBe(2);
+        let [{ url, dataType, success, context }] = $.ajax.calls.argsFor(1);
+        expect(url).toBe(
+          `${BUILD_URL}/trace.json?state=${encodeURIComponent(INITIAL_BUILD_TRACE_STATE)}`,
+        );
+        expect(dataType).toBe('json');
+        expect(success).toEqual(jasmine.any(Function));
+
+        success.call(context, {
+          html: '<span>Update<span>',
+          status: 'running',
+          state: 'newstate',
+          append: true,
         });
 
-        it('removes the spinner', function () {
-          const [{ success, context }] = $.ajax.calls.argsFor(0);
-          success.call(context, { trace_html: '<span>Example</span>', status: 'success' });
+        expect($('#build-trace .js-build-output').text()).toMatch(/Update/);
+        expect(this.build.state).toBe('newstate');
 
-          expect($('.js-build-refresh').length).toBe(0);
+        jasmine.clock().tick(4001);
+
+        expect($.ajax.calls.count()).toBe(3);
+        [{ url, dataType, success, context }] = $.ajax.calls.argsFor(2);
+        expect(url).toBe(`${BUILD_URL}/trace.json?state=newstate`);
+        expect(dataType).toBe('json');
+        expect(success).toEqual(jasmine.any(Function));
+
+        success.call(context, {
+          html: '<span>More</span>',
+          status: 'running',
+          state: 'finalstate',
+          append: true,
         });
+
+        expect($('#build-trace .js-build-output').text()).toMatch(/UpdateMore/);
+        expect(this.build.state).toBe('finalstate');
       });
 
-      describe('running build', function () {
-        beforeEach(function () {
-          $('.js-build-options').data('buildStatus', 'running');
-          this.build = new Build();
-          spyOn(this.build, 'location')
-            .and.returnValue('http://example.com/root/test-build/builds/2');
+      it('replaces the entire build trace', () => {
+        jasmine.clock().tick(4001);
+        let [{ success, context }] = $.ajax.calls.argsFor(1);
+        success.call(context, {
+          html: '<span>Update</span>',
+          status: 'running',
+          append: true,
         });
 
-        it('updates the build trace on an interval', function () {
-          jasmine.clock().tick(4001);
-
-          expect($.ajax.calls.count()).toBe(2);
-          let [{ url, dataType, success, context }] = $.ajax.calls.argsFor(1);
-          expect(url).toBe(
-            'http://example.com/root/test-build/builds/2/trace.json?state=buildstate'
-          );
-          expect(dataType).toBe('json');
-          expect(success).toEqual(jasmine.any(Function));
-
-          success.call(context, {
-            html: '<span>Update<span>',
-            status: 'running',
-            state: 'newstate',
-            append: true,
-          });
-
-          expect($('#build-trace .js-build-output').text()).toMatch(/Update/);
-          expect(this.build.state).toBe('newstate');
-
-          jasmine.clock().tick(4001);
-
-          expect($.ajax.calls.count()).toBe(3);
-          [{ url, dataType, success, context }] = $.ajax.calls.argsFor(2);
-          expect(url).toBe(
-            'http://example.com/root/test-build/builds/2/trace.json?state=newstate'
-          );
-          expect(dataType).toBe('json');
-          expect(success).toEqual(jasmine.any(Function));
-
-          success.call(context, {
-            html: '<span>More</span>',
-            status: 'running',
-            state: 'finalstate',
-            append: true,
-          });
-
-          expect($('#build-trace .js-build-output').text()).toMatch(/UpdateMore/);
-          expect(this.build.state).toBe('finalstate');
-        });
+        expect($('#build-trace .js-build-output').text()).toMatch(/Update/);
 
-        it('replaces the entire build trace', function () {
-          jasmine.clock().tick(4001);
-          let [{ success, context }] = $.ajax.calls.argsFor(1);
-          success.call(context, {
-            html: '<span>Update</span>',
-            status: 'running',
-            append: true,
-          });
-
-          expect($('#build-trace .js-build-output').text()).toMatch(/Update/);
-
-          jasmine.clock().tick(4001);
-          [{ success, context }] = $.ajax.calls.argsFor(2);
-          success.call(context, {
-            html: '<span>Different</span>',
-            status: 'running',
-            append: false,
-          });
-
-          expect($('#build-trace .js-build-output').text()).not.toMatch(/Update/);
-          expect($('#build-trace .js-build-output').text()).toMatch(/Different/);
+        jasmine.clock().tick(4001);
+        [{ success, context }] = $.ajax.calls.argsFor(2);
+        success.call(context, {
+          html: '<span>Different</span>',
+          status: 'running',
+          append: false,
         });
 
-        it('reloads the page when the build is done', function () {
-          spyOn(Turbolinks, 'visit');
+        expect($('#build-trace .js-build-output').text()).not.toMatch(/Update/);
+        expect($('#build-trace .js-build-output').text()).toMatch(/Different/);
+      });
 
-          jasmine.clock().tick(4001);
-          const [{ success, context }] = $.ajax.calls.argsFor(1);
-          success.call(context, {
-            html: '<span>Final</span>',
-            status: 'passed',
-            append: true,
-          });
+      it('reloads the page when the build is done', () => {
+        spyOn(Turbolinks, 'visit');
 
-          expect(Turbolinks.visit).toHaveBeenCalledWith(
-            'http://example.com/root/test-build/builds/2'
-          );
+        jasmine.clock().tick(4001);
+        const [{ success, context }] = $.ajax.calls.argsFor(1);
+        success.call(context, {
+          html: '<span>Final</span>',
+          status: 'passed',
+          append: true,
         });
+
+        expect(Turbolinks.visit).toHaveBeenCalledWith(BUILD_URL);
       });
     });
   });
-})();
+});