Commit 5f192c77 authored by Mike Greiling's avatar Mike Greiling

update all frontend tests to point to precompiled fixtures

parent 6370e326
......@@ -7,7 +7,7 @@
(() => {
window.gon || (window.gon = {});
const fixtureTemplate = 'event_filter.html';
const fixtureTemplate = 'static/event_filter.html.raw';
const filters = [
{
id: 'all',
......
......@@ -5,9 +5,9 @@
(function() {
describe('Quick Submit behavior', function() {
var keydownEvent;
fixture.preload('behaviors/quick_submit.html');
fixture.preload('static/behaviors/quick_submit.html.raw');
beforeEach(function() {
fixture.load('behaviors/quick_submit.html');
fixture.load('static/behaviors/quick_submit.html.raw');
$('form').submit(function(e) {
// Prevent a form submit from moving us off the testing page
return e.preventDefault();
......
......@@ -4,9 +4,9 @@
(function() {
describe('requiresInput', function() {
fixture.preload('behaviors/requires_input.html');
fixture.preload('static/behaviors/requires_input.html.raw');
beforeEach(function() {
return fixture.load('behaviors/requires_input.html');
return fixture.load('static/behaviors/requires_input.html.raw');
});
it('disables submit when any field is required', function() {
$('.js-requires-input').requiresInput();
......
......@@ -2,10 +2,10 @@
(() => {
describe('Linked Tabs', () => {
fixture.preload('linked_tabs');
fixture.preload('static/linked_tabs.html.raw');
beforeEach(() => {
fixture.load('linked_tabs');
fixture.load('static/linked_tabs.html.raw');
});
describe('when is initialized', () => {
......
......@@ -7,7 +7,7 @@
((global) => {
describe('Dashboard', () => {
const fixtureTemplate = 'dashboard.html';
const fixtureTemplate = 'static/dashboard.html.raw';
function todosCountText() {
return $('.js-todos-count').text();
......
......@@ -2,10 +2,10 @@
//= require environments/components/environment_actions
describe('Actions Component', () => {
fixture.preload('environments/element.html');
fixture.preload('static/environments/element.html.raw');
beforeEach(() => {
fixture.load('environments/element.html');
fixture.load('static/environments/element.html.raw');
});
it('should render a dropdown with the provided actions', () => {
......
......@@ -2,9 +2,9 @@
//= require environments/components/environment_external_url
describe('External URL Component', () => {
fixture.preload('environments/element.html');
fixture.preload('static/environments/element.html.raw');
beforeEach(() => {
fixture.load('environments/element.html');
fixture.load('static/environments/element.html.raw');
});
it('should link to the provided externalUrl prop', () => {
......
......@@ -3,9 +3,9 @@
//= require environments/components/environment_item
describe('Environment item', () => {
fixture.preload('environments/table.html');
fixture.preload('static/environments/table.html.raw');
beforeEach(() => {
fixture.load('environments/table.html');
fixture.load('static/environments/table.html.raw');
});
describe('When item is folder', () => {
......
//= require vue
//= require environments/components/environment_rollback
describe('Rollback Component', () => {
fixture.preload('environments/element.html');
fixture.preload('static/environments/element.html.raw');
const retryURL = 'https://gitlab.com/retry';
beforeEach(() => {
fixture.load('environments/element.html');
fixture.load('static/environments/element.html.raw');
});
it('Should link to the provided retryUrl', () => {
......
//= require vue
//= require environments/components/environment_stop
describe('Stop Component', () => {
fixture.preload('environments/element.html');
fixture.preload('static/environments/element.html.raw');
let stopURL;
let component;
beforeEach(() => {
fixture.load('environments/element.html');
fixture.load('static/environments/element.html.raw');
stopURL = '/stop';
component = new window.gl.environmentsList.StopComponent({
......
......@@ -43,7 +43,7 @@
}
describe('Dropdown', function describeDropdown() {
fixture.preload('gl_dropdown.html');
fixture.preload('static/gl_dropdown.html.raw');
fixture.preload('projects.json');
function initDropDown(hasRemote, isFilterable) {
......@@ -61,7 +61,7 @@
}
beforeEach(() => {
fixture.load('gl_dropdown.html');
fixture.load('static/gl_dropdown.html.raw');
this.dropdownContainerElement = $('.dropdown.inline');
this.$dropdownMenuElement = $('.dropdown-menu', this.dropdownContainerElement);
this.projectsData = fixture.load('projects.json')[0];
......
......@@ -4,11 +4,11 @@
//= require gl_field_errors
((global) => {
fixture.preload('gl_field_errors.html');
fixture.preload('static/gl_field_errors.html.raw');
describe('GL Style Field Errors', function() {
beforeEach(function() {
fixture.load('gl_field_errors.html');
fixture.load('static/gl_field_errors.html.raw');
const $form = this.$form = $('form.gl-show-field-errors');
this.fieldErrors = new global.GlFieldErrors($form);
});
......
......@@ -7,7 +7,7 @@
describe('Header', function() {
var todosPendingCount = '.todos-pending-count';
var fixtureTemplate = 'header.html';
var fixtureTemplate = 'static/header.html.raw';
function isTodosCountHidden() {
return $(todosPendingCount).hasClass('hidden');
......
......@@ -21,10 +21,10 @@
}
describe('Issuable', () => {
fixture.preload('issuable_filter');
fixture.preload('static/issuable_filter.html.raw');
beforeEach(() => {
fixture.load('issuable_filter');
fixture.load('static/issuable_filter.html.raw');
Issuable.init();
});
......@@ -37,7 +37,7 @@
beforeEach(() => {
$filtersForm = $('.js-filter-form');
fixture.load('issuable_filter');
fixture.load('static/issuable_filter.html.raw');
resetForm($filtersForm);
});
......
......@@ -8,9 +8,9 @@
var INVALID_URL = 'http://goesnowhere.nothing/whereami';
var $boxClosed, $boxOpen, $btnClose, $btnReopen;
fixture.preload('issues/closed-issue.html');
fixture.preload('issues/issue-with-task-list.html');
fixture.preload('issues/open-issue.html');
fixture.preload('issues/closed-issue.html.raw');
fixture.preload('issues/issue-with-task-list.html.raw');
fixture.preload('issues/open-issue.html.raw');
function expectErrorMessage() {
var $flashMessage = $('div.flash-alert');
......@@ -61,7 +61,7 @@
describe('Issue', function() {
describe('task lists', function() {
fixture.load('issues/issue-with-task-list.html');
fixture.load('issues/issue-with-task-list.html.raw');
beforeEach(function() {
this.issue = new Issue();
});
......@@ -86,7 +86,7 @@
describe('close issue', function() {
beforeEach(function() {
fixture.load('issues/open-issue.html');
fixture.load('issues/open-issue.html.raw');
findElements();
this.issue = new Issue();
......@@ -140,7 +140,7 @@
describe('reopen issue', function() {
beforeEach(function() {
fixture.load('issues/closed-issue.html');
fixture.load('issues/closed-issue.html.raw');
findElements();
this.issue = new Issue();
......
......@@ -17,10 +17,10 @@
(() => {
let saveLabelCount = 0;
describe('Issue dropdown sidebar', () => {
fixture.preload('issue_sidebar_label.html');
fixture.preload('static/issue_sidebar_label.html.raw');
beforeEach(() => {
fixture.load('issue_sidebar_label.html');
fixture.load('static/issue_sidebar_label.html.raw');
new IssuableContext('{"id":1,"name":"Administrator","username":"root"}');
new LabelsSelect();
......
......@@ -6,7 +6,7 @@
(function() {
describe('LineHighlighter', function() {
var clickLine;
fixture.preload('line_highlighter.html');
fixture.preload('static/line_highlighter.html.raw');
clickLine = function(number, eventData) {
var e;
if (eventData == null) {
......@@ -20,7 +20,7 @@
}
};
beforeEach(function() {
fixture.load('line_highlighter.html');
fixture.load('static/line_highlighter.html.raw');
this["class"] = new LineHighlighter();
this.css = this["class"].highlightClass;
return this.spies = {
......
......@@ -6,9 +6,9 @@
(function() {
describe('MergeRequest', function() {
return describe('task lists', function() {
fixture.preload('merge_requests_show.html');
fixture.preload('static/merge_requests_show.html.raw');
beforeEach(function() {
fixture.load('merge_requests_show.html');
fixture.load('static/merge_requests_show.html.raw');
return this.merge = new MergeRequest();
});
it('modifies the Markdown field', function() {
......
......@@ -16,7 +16,7 @@
};
$.extend(stubLocation, defaults, stubs || {});
};
fixture.preload('merge_request_tabs.html');
fixture.preload('static/merge_request_tabs.html.raw');
beforeEach(function () {
this.class = new gl.MergeRequestTabs({ stubLocation: stubLocation });
......@@ -30,7 +30,7 @@
describe('#activateTab', function () {
beforeEach(function () {
spyOn($, 'ajax').and.callFake(function () {});
fixture.load('merge_request_tabs.html');
fixture.load('static/merge_request_tabs.html.raw');
this.subject = this.class.activateTab;
});
it('shows the first tab when action is show', function () {
......
......@@ -5,10 +5,10 @@
(() => {
describe('Mini Pipeline Graph Dropdown', () => {
fixture.preload('mini_dropdown_graph');
fixture.preload('static/mini_dropdown_graph.html.raw');
beforeEach(() => {
fixture.load('mini_dropdown_graph');
fixture.load('static/mini_dropdown_graph.html.raw');
});
describe('When is initialized', () => {
......
......@@ -8,7 +8,7 @@
describe('Branch', function() {
return describe('create a new branch', function() {
var expectToHaveError, fillNameWith;
fixture.preload('new_branch.html');
fixture.preload('static/new_branch.html.raw');
fillNameWith = function(value) {
return $('.js-branch-name').val(value).trigger('blur');
};
......@@ -16,7 +16,7 @@
return expect($('.js-branch-name-error span').text()).toEqual(error);
};
beforeEach(function() {
fixture.load('new_branch.html');
fixture.load('static/new_branch.html.raw');
$('form').on('submit', function(e) {
return e.preventDefault();
});
......
......@@ -12,7 +12,7 @@
gl.utils = gl.utils || {};
describe('Notes', function() {
var commentsTemplate = 'issues/issue_with_comment.raw';
var commentsTemplate = 'issues/issue_with_comment.html.raw';
fixture.preload(commentsTemplate);
beforeEach(function () {
......
......@@ -2,10 +2,10 @@
(() => {
describe('Pipelines', () => {
fixture.preload('pipeline_graph');
fixture.preload('static/pipeline_graph.html.raw');
beforeEach(() => {
fixture.load('pipeline_graph');
fixture.load('static/pipeline_graph.html.raw');
});
it('should be defined', () => {
......
......@@ -16,10 +16,10 @@
window.gon.api_version = 'v3';
describe('Project Title', function() {
fixture.preload('project_title.html');
fixture.preload('static/project_title.html.raw');
fixture.preload('projects.json');
beforeEach(function() {
fixture.load('project_title.html');
fixture.load('static/project_title.html.raw');
return this.project = new Project();
});
return describe('project list', function() {
......
......@@ -112,9 +112,9 @@
};
describe('Search autocomplete dropdown', function() {
fixture.preload('search_autocomplete.html');
fixture.preload('static/search_autocomplete.html.raw');
beforeEach(function() {
fixture.load('search_autocomplete.html');
fixture.load('static/search_autocomplete.html.raw');
return widget = new gl.SearchAutocomplete;
});
it('should show Dashboard specific dropdown menu', function() {
......
......@@ -2,7 +2,7 @@
((global) => {
describe('SigninTabsMemoizer', () => {
const fixtureTemplate = 'signin_tabs.html';
const fixtureTemplate = 'static/signin_tabs.html.raw';
const tabSelector = 'ul.nav-tabs';
const currentTabKey = 'current_signin_tab';
let memo;
......
......@@ -10,7 +10,7 @@
(function() {
describe('U2FAuthenticate', function() {
fixture.load('u2f/authenticate');
fixture.load('static/u2f/authenticate.html.raw');
beforeEach(function() {
this.u2fDevice = new MockU2FDevice;
this.container = $("#js-authenticate-u2f");
......
......@@ -10,7 +10,7 @@
(function() {
describe('U2FRegister', function() {
fixture.load('u2f/register');
fixture.load('static/u2f/register.html.raw');
beforeEach(function() {
this.u2fDevice = new MockU2FDevice;
this.container = $("#js-register-u2f");
......
......@@ -13,7 +13,7 @@ module JavaScriptFixturesHelpers
#
def clean_frontend_fixtures(directory_name)
directory_name = File.expand_path(directory_name, FIXTURE_PATH)
Dir[File.expand_path('**/*.html.raw', directory_name)].each do |file_name|
Dir[File.expand_path('*.html.raw', directory_name)].each do |file_name|
FileUtils.rm(file_name)
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment