diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-31 19:11:48 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-31 19:11:48 +0000 |
commit | f06daa26efc127565e4e68ca9d4ac62e5a1e3b36 (patch) | |
tree | e212d23f502d60b29d89dc5151d22b246d15d953 /spec/javascripts | |
parent | 87e761da9222f277bdc5a638c54d30192abe2779 (diff) | |
parent | 61227393dc1bc8240b7e9413a613f7aacdaed2c2 (diff) | |
download | gitlab-ce-f06daa26efc127565e4e68ca9d4ac62e5a1e3b36.tar.gz |
Merge branch 'rename-builds-controller' into 'master'
Rename BuildsController to JobsController
Closes #30699
See merge request !11407
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/build_spec.js | 2 | ||||
-rw-r--r-- | spec/javascripts/fixtures/jobs.rb (renamed from spec/javascripts/fixtures/builds.rb) | 2 | ||||
-rw-r--r-- | spec/javascripts/lib/utils/common_utils_spec.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/javascripts/build_spec.js b/spec/javascripts/build_spec.js index 278bd1f9179..461908f3fde 100644 --- a/spec/javascripts/build_spec.js +++ b/spec/javascripts/build_spec.js @@ -8,7 +8,7 @@ import '~/breakpoints'; import 'vendor/jquery.nicescroll'; describe('Build', () => { - const BUILD_URL = `${gl.TEST_HOST}/frontend-fixtures/builds-project/builds/1`; + const BUILD_URL = `${gl.TEST_HOST}/frontend-fixtures/builds-project/-/jobs/1`; preloadFixtures('builds/build-with-artifacts.html.raw'); diff --git a/spec/javascripts/fixtures/builds.rb b/spec/javascripts/fixtures/jobs.rb index 320de791b08..dc7dde1138c 100644 --- a/spec/javascripts/fixtures/builds.rb +++ b/spec/javascripts/fixtures/jobs.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Projects::BuildsController, '(JavaScript fixtures)', type: :controller do +describe Projects::JobsController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let(:admin) { create(:admin) } diff --git a/spec/javascripts/lib/utils/common_utils_spec.js b/spec/javascripts/lib/utils/common_utils_spec.js index e9bffd74d90..e3938a77680 100644 --- a/spec/javascripts/lib/utils/common_utils_spec.js +++ b/spec/javascripts/lib/utils/common_utils_spec.js @@ -356,7 +356,7 @@ import '~/lib/utils/common_utils'; describe('gl.utils.setCiStatusFavicon', () => { it('should set page favicon to CI status favicon based on provided status', () => { - const BUILD_URL = `${gl.TEST_HOST}/frontend-fixtures/builds-project/builds/1/status.json`; + const BUILD_URL = `${gl.TEST_HOST}/frontend-fixtures/builds-project/-/jobs/1/status.json`; const FAVICON_PATH = '//icon_status_success'; const spySetFavicon = spyOn(gl.utils, 'setFavicon').and.stub(); const spyResetFavicon = spyOn(gl.utils, 'resetFavicon').and.stub(); |