From d152a74ce393d76b1fbbf1b0a304125f3c9457c4 Mon Sep 17 00:00:00 2001 From: Winnie Hellmann Date: Thu, 25 Apr 2019 11:35:33 +0200 Subject: [PATCH] Move all static fixtures to static directory --- .../fixtures/{ => static}/images/green_box.png | Bin .../{ => static/images}/one_white_pixel.png | Bin .../fixtures/{ => static}/images/red_box.png | Bin .../javascripts/fixtures/{ => static}/projects.json | 0 spec/javascripts/gl_dropdown_spec.js | 4 ++-- spec/javascripts/test_constants.js | 6 +++--- .../project_selector/project_list_item_spec.js | 4 ++-- .../project_selector/project_selector_spec.js | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) rename spec/javascripts/fixtures/{ => static}/images/green_box.png (100%) rename spec/javascripts/fixtures/{ => static/images}/one_white_pixel.png (100%) rename spec/javascripts/fixtures/{ => static}/images/red_box.png (100%) rename spec/javascripts/fixtures/{ => static}/projects.json (100%) diff --git a/spec/javascripts/fixtures/images/green_box.png b/spec/javascripts/fixtures/static/images/green_box.png similarity index 100% rename from spec/javascripts/fixtures/images/green_box.png rename to spec/javascripts/fixtures/static/images/green_box.png diff --git a/spec/javascripts/fixtures/one_white_pixel.png b/spec/javascripts/fixtures/static/images/one_white_pixel.png similarity index 100% rename from spec/javascripts/fixtures/one_white_pixel.png rename to spec/javascripts/fixtures/static/images/one_white_pixel.png diff --git a/spec/javascripts/fixtures/images/red_box.png b/spec/javascripts/fixtures/static/images/red_box.png similarity index 100% rename from spec/javascripts/fixtures/images/red_box.png rename to spec/javascripts/fixtures/static/images/red_box.png diff --git a/spec/javascripts/fixtures/projects.json b/spec/javascripts/fixtures/static/projects.json similarity index 100% rename from spec/javascripts/fixtures/projects.json rename to spec/javascripts/fixtures/static/projects.json diff --git a/spec/javascripts/gl_dropdown_spec.js b/spec/javascripts/gl_dropdown_spec.js index 57e31d933ca..8c7820ddb52 100644 --- a/spec/javascripts/gl_dropdown_spec.js +++ b/spec/javascripts/gl_dropdown_spec.js @@ -6,7 +6,7 @@ import '~/lib/utils/common_utils'; describe('glDropdown', function describeDropdown() { preloadFixtures('static/gl_dropdown.html'); - loadJSONFixtures('projects.json'); + loadJSONFixtures('static/projects.json'); const NON_SELECTABLE_CLASSES = '.divider, .separator, .dropdown-header, .dropdown-menu-empty-item'; @@ -67,7 +67,7 @@ describe('glDropdown', function describeDropdown() { loadFixtures('static/gl_dropdown.html'); this.dropdownContainerElement = $('.dropdown.inline'); this.$dropdownMenuElement = $('.dropdown-menu', this.dropdownContainerElement); - this.projectsData = getJSONFixture('projects.json'); + this.projectsData = getJSONFixture('static/projects.json'); }); afterEach(() => { diff --git a/spec/javascripts/test_constants.js b/spec/javascripts/test_constants.js index a820dd2d09c..24b5512b053 100644 --- a/spec/javascripts/test_constants.js +++ b/spec/javascripts/test_constants.js @@ -1,7 +1,7 @@ export const FIXTURES_PATH = '/base/spec/javascripts/fixtures'; export const TEST_HOST = 'http://test.host'; -export const DUMMY_IMAGE_URL = `${FIXTURES_PATH}/one_white_pixel.png`; +export const DUMMY_IMAGE_URL = `${FIXTURES_PATH}/static/images/one_white_pixel.png`; -export const GREEN_BOX_IMAGE_URL = `${FIXTURES_PATH}/images/green_box.png`; -export const RED_BOX_IMAGE_URL = `${FIXTURES_PATH}/images/red_box.png`; +export const GREEN_BOX_IMAGE_URL = `${FIXTURES_PATH}/static/images/green_box.png`; +export const RED_BOX_IMAGE_URL = `${FIXTURES_PATH}/static/images/red_box.png`; diff --git a/spec/javascripts/vue_shared/components/project_selector/project_list_item_spec.js b/spec/javascripts/vue_shared/components/project_selector/project_list_item_spec.js index b95183747bb..268ced38f40 100644 --- a/spec/javascripts/vue_shared/components/project_selector/project_list_item_spec.js +++ b/spec/javascripts/vue_shared/components/project_selector/project_list_item_spec.js @@ -9,8 +9,8 @@ describe('ProjectListItem component', () => { let wrapper; let vm; let options; - loadJSONFixtures('projects.json'); - const project = getJSONFixture('projects.json')[0]; + loadJSONFixtures('static/projects.json'); + const project = getJSONFixture('static/projects.json')[0]; beforeEach(() => { options = { diff --git a/spec/javascripts/vue_shared/components/project_selector/project_selector_spec.js b/spec/javascripts/vue_shared/components/project_selector/project_selector_spec.js index ba9ec8f2f19..34c0cd435cd 100644 --- a/spec/javascripts/vue_shared/components/project_selector/project_selector_spec.js +++ b/spec/javascripts/vue_shared/components/project_selector/project_selector_spec.js @@ -8,8 +8,8 @@ import { trimText } from 'spec/helpers/vue_component_helper'; describe('ProjectSelector component', () => { let wrapper; let vm; - loadJSONFixtures('projects.json'); - const allProjects = getJSONFixture('projects.json'); + loadJSONFixtures('static/projects.json'); + const allProjects = getJSONFixture('static/projects.json'); const searchResults = allProjects.slice(0, 5); let selected = []; selected = selected.concat(allProjects.slice(0, 3)).concat(allProjects.slice(5, 8));