From 43898f8efbe4981ad2ca67e7804db2c73fe2f3e2 Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Fri, 18 Nov 2016 19:40:47 +0000 Subject: Fix broken tests --- .../environments/environment_actions_spec.js.es6 | 6 +++--- .../environments/environment_item_spec.js.es6 | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/spec/javascripts/environments/environment_actions_spec.js.es6 b/spec/javascripts/environments/environment_actions_spec.js.es6 index 1097582a8e9..c9ac7a73fd0 100644 --- a/spec/javascripts/environments/environment_actions_spec.js.es6 +++ b/spec/javascripts/environments/environment_actions_spec.js.es6 @@ -12,11 +12,11 @@ describe('Actions Component', () => { const actionsMock = [ { name: 'bar', - play_url: 'https://gitlab.com/play', + play_path: 'https://gitlab.com/play', }, { name: 'foo', - play_url: '#', + play_path: '#', }, ]; @@ -32,6 +32,6 @@ describe('Actions Component', () => { ).toEqual(actionsMock.length); expect( component.$el.querySelector('.dropdown-menu li a').getAttribute('href') - ).toEqual(actionsMock[0].play_url); + ).toEqual(actionsMock[0].play_path); }); }); diff --git a/spec/javascripts/environments/environment_item_spec.js.es6 b/spec/javascripts/environments/environment_item_spec.js.es6 index 7559258426b..54c93367b17 100644 --- a/spec/javascripts/environments/environment_item_spec.js.es6 +++ b/spec/javascripts/environments/environment_item_spec.js.es6 @@ -74,7 +74,7 @@ describe('Environment item', () => { sha: '500aabcb17c97bdcf2d0c410b70cb8556f0362dd', ref: { name: 'master', - ref_url: 'http://localhost:3000/root/ci-folders/tree/master', + ref_path: 'root/ci-folders/tree/master', }, tag: true, 'last?': true, @@ -102,23 +102,23 @@ describe('Environment item', () => { avatar_url: 'http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon', web_url: 'http://localhost:3000/root', }, - commit_url: 'http://localhost:3000/root/ci-folders/tree/500aabcb17c97bdcf2d0c410b70cb8556f0362dd', + commit_path: '/root/ci-folders/tree/500aabcb17c97bdcf2d0c410b70cb8556f0362dd', }, deployable: { id: 1279, name: 'deploy', - build_url: 'http://localhost:3000/root/ci-folders/builds/1279', - retry_url: 'http://localhost:3000/root/ci-folders/builds/1279/retry', + build_path: '/root/ci-folders/builds/1279', + retry_path: '/root/ci-folders/builds/1279/retry', }, manual_actions: [ { name: 'action', - play_url: 'http://localhost:3000/play', + play_path: '/play', }, ], }, 'stoppable?': true, - environment_url: 'http://localhost:3000/root/ci-folders/environments/31', + environment_path: 'root/ci-folders/environments/31', created_at: '2016-11-07T11:11:16.525Z', updated_at: '2016-11-10T15:55:58.778Z', }; @@ -161,13 +161,13 @@ describe('Environment item', () => { it('Should link to build url provided', () => { expect( component.$el.querySelector('.build-link').getAttribute('href') - ).toEqual(environment.last_deployment.deployable.build_url); + ).toEqual(environment.last_deployment.deployable.build_path); }); it('Should render deployable name and id', () => { expect( component.$el.querySelector('.build-link').getAttribute('href') - ).toEqual(environment.last_deployment.deployable.build_url); + ).toEqual(environment.last_deployment.deployable.build_path); }); }); -- cgit v1.2.3