Merge branch 'winh-move-static-fixtures' into 'master'
Move all static fixtures to static directory See merge request gitlab-org/gitlab-ce!27668
This commit is contained in:
commit
0af0e0fb1d
8 changed files with 9 additions and 9 deletions
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 68 B After Width: | Height: | Size: 68 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
@ -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(() => {
|
||||
|
|
|
@ -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`;
|
||||
|
|
|
@ -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 = {
|
||||
|
|
|
@ -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));
|
||||
|
|
Loading…
Reference in a new issue