diff options
| author | winniehell <git@winniehell.de> | 2016-11-20 00:40:37 +0100 |
|---|---|---|
| committer | winniehell <git@winniehell.de> | 2016-11-25 11:03:35 +0100 |
| commit | 82429b6978361daaf703a3438c7822ac956a3aa4 (patch) | |
| tree | 02b15d2f3cd5386117ae0dd74c3fc1b78871e617 | |
| parent | 918bc207c680bed46e82bef996aea027ac72b38d (diff) | |
| download | gitlab-ce-82429b6978361daaf703a3438c7822ac956a3aa4.tar.gz | |
Explicitly name namespace and projects for frontend fixtures
| -rw-r--r-- | spec/javascripts/build_spec.js.es6 | 2 | ||||
| -rw-r--r-- | spec/javascripts/fixtures/builds.rb | 3 | ||||
| -rw-r--r-- | spec/javascripts/fixtures/issues.rb | 3 | ||||
| -rw-r--r-- | spec/javascripts/issue_spec.js | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/spec/javascripts/build_spec.js.es6 b/spec/javascripts/build_spec.js.es6 index 50411695925..304c4d4e29d 100644 --- a/spec/javascripts/build_spec.js.es6 +++ b/spec/javascripts/build_spec.js.es6 @@ -10,7 +10,7 @@ //= require turbolinks describe('Build', () => { - const BUILD_URL = `${gl.TEST_HOST}/namespace1/project1/builds/1`; + 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 diff --git a/spec/javascripts/fixtures/builds.rb b/spec/javascripts/fixtures/builds.rb index e47698f71ed..978e25a1c32 100644 --- a/spec/javascripts/fixtures/builds.rb +++ b/spec/javascripts/fixtures/builds.rb @@ -4,7 +4,8 @@ describe Projects::BuildsController, '(JavaScript fixtures)', type: :controller include JavaScriptFixturesHelpers let(:admin) { create(:admin) } - let(:project) { create(:project_empty_repo) } + let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} + let(:project) { create(:project_empty_repo, namespace: namespace, path: 'builds-project') } let(:pipeline) { create(:ci_empty_pipeline, project: project) } let!(:build_with_artifacts) { create(:ci_build, :success, :artifacts, :trace, pipeline: pipeline, stage: 'test', artifacts_expire_at: Time.now + 18.months) } let!(:failed_build) { create(:ci_build, :failed, pipeline: pipeline, stage: 'build') } diff --git a/spec/javascripts/fixtures/issues.rb b/spec/javascripts/fixtures/issues.rb index d95eb851421..c10784fe5ae 100644 --- a/spec/javascripts/fixtures/issues.rb +++ b/spec/javascripts/fixtures/issues.rb @@ -4,7 +4,8 @@ describe Projects::IssuesController, '(JavaScript fixtures)', type: :controller include JavaScriptFixturesHelpers let(:admin) { create(:admin) } - let(:project) { create(:project_empty_repo) } + let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} + let(:project) { create(:project_empty_repo, namespace: namespace, path: 'issues-project') } render_views diff --git a/spec/javascripts/issue_spec.js b/spec/javascripts/issue_spec.js index ab92bdf01fd..14af6644de1 100644 --- a/spec/javascripts/issue_spec.js +++ b/spec/javascripts/issue_spec.js @@ -74,7 +74,7 @@ it('submits an ajax request on tasklist:changed', function() { spyOn(jQuery, 'ajax').and.callFake(function(req) { expect(req.type).toBe('PATCH'); - expect(req.url).toBe(gl.TEST_HOST + '/namespace3/project3/issues/1.json'); + expect(req.url).toBe(gl.TEST_HOST + '/frontend-fixtures/issues-project/issues/1.json'); // eslint-disable-line prefer-template expect(req.data.issue.description).not.toBe(null); }); |