Merge branch 'master' into 28869-es6-modules28869-es6-modules

* master: (117 commits)
  small change to make less conflict with EE version
  Add cop for use of remove_column
  Resolve merge conflicts with dev.gitlab.org/master after security release
  add index for doc/administration/operations/
  Remove RubySampler#sample_objects for performance as well
  Bugfix: User can't change the access level of an access requester
  Add spec for removing issues.assignee_id
  updated imports
  Keep track of storage check timings
  Remove a header level in the new 'Automatic CE->EE merge' doc
  Improve down step of removing issues.assignee_id column
  Fix specs after removing assignee_id field
  Remove issues.assignee_id column
  Resolve conflicts in app/models/user.rb
  Fix image view mode
  Do not raise when downstream pipeline is created
  Remove the need for destroy and add a comment in the spec
  Use build instead of create in importer spec
  Simplify normalizing of paths
  Remove allocation tracking code from InfluxDB sampler for performance
  ...

1 files changed, 10 insertions, 10 deletions

diff --git a/spec/javascripts/job_spec.js b/spec/javascripts/job_spec.js
index 5e67911d338..4f06237deb5 100644
--- a/spec/javascripts/job_spec.js
+++ b/spec/javascripts/job_spec.js
@@ -1,6 +1,6 @@
 import { bytesToKiB } from '~/lib/utils/number_utils';
+import * as urlUtils from '~/lib/utils/url_utility';
 import '~/lib/utils/datetime_utility';
-import '~/lib/utils/url_utility';
 import Job from '~/job';
 import '~/breakpoints';
 
@@ -28,7 +28,7 @@ describe('Job', () => {
       });
 
       it('copies build options', function () {
-        expect(this.job.pageUrl).toBe(JOB_URL);
+        expect(this.job.pagePath).toBe(JOB_URL);
         expect(this.job.buildStatus).toBe('success');
         expect(this.job.buildStage).toBe('test');
         expect(this.job.state).toBe('');
@@ -65,7 +65,7 @@ describe('Job', () => {
         const deferred2 = $.Deferred();
         const deferred3 = $.Deferred();
         spyOn($, 'ajax').and.returnValues(deferred1.promise(), deferred2.promise(), deferred3.promise());
-        spyOn(gl.utils, 'visitUrl');
+        spyOn(urlUtils, 'visitUrl');
 
         deferred1.resolve({
           html: '<span>Update<span>',
@@ -103,7 +103,7 @@ describe('Job', () => {
 
         spyOn($, 'ajax').and.returnValues(deferred1.promise(), deferred2.promise(), deferred3.promise());
 
-        spyOn(gl.utils, 'visitUrl');
+        spyOn(urlUtils, 'visitUrl');
 
         deferred1.resolve({
           html: '<span>Update<span>',
@@ -134,7 +134,7 @@ describe('Job', () => {
     describe('truncated information', () => {
       describe('when size is less than total', () => {
         it('shows information about truncated log', () => {
-          spyOn(gl.utils, 'visitUrl');
+          spyOn(urlUtils, 'visitUrl');
           const deferred = $.Deferred();
           spyOn($, 'ajax').and.returnValue(deferred.promise());
 
@@ -153,7 +153,7 @@ describe('Job', () => {
 
         it('shows the size in KiB', () => {
           const size = 50;
-          spyOn(gl.utils, 'visitUrl');
+          spyOn(urlUtils, 'visitUrl');
           const deferred = $.Deferred();
 
           spyOn($, 'ajax').and.returnValue(deferred.promise());
@@ -179,7 +179,7 @@ describe('Job', () => {
 
           spyOn($, 'ajax').and.returnValues(deferred1.promise(), deferred2.promise(), deferred3.promise());
 
-          spyOn(gl.utils, 'visitUrl');
+          spyOn(urlUtils, 'visitUrl');
 
           deferred1.resolve({
             html: '<span>Update</span>',
@@ -214,7 +214,7 @@ describe('Job', () => {
 
         it('renders the raw link', () => {
           const deferred = $.Deferred();
-          spyOn(gl.utils, 'visitUrl');
+          spyOn(urlUtils, 'visitUrl');
 
           spyOn($, 'ajax').and.returnValue(deferred.promise());
           deferred.resolve({
@@ -236,7 +236,7 @@ describe('Job', () => {
       describe('when size is equal than total', () => {
         it('does not show the trunctated information', () => {
           const deferred = $.Deferred();
-          spyOn(gl.utils, 'visitUrl');
+          spyOn(urlUtils, 'visitUrl');
 
           spyOn($, 'ajax').and.returnValue(deferred.promise());
           deferred.resolve({
@@ -257,7 +257,7 @@ describe('Job', () => {
     describe('output trace', () => {
       beforeEach(() => {
         const deferred = $.Deferred();
-        spyOn(gl.utils, 'visitUrl');
+        spyOn(urlUtils, 'visitUrl');
 
         spyOn($, 'ajax').and.returnValue(deferred.promise());
         deferred.resolve({