Commit ad985a7a authored by Winnie Hellmann's avatar Winnie Hellmann Committed by Mike Greiling

Merge branch 'winh-remove-sushi' into 'master'

Remove .raw from JavaScript fixture file names

Closes #59201

See merge request gitlab-org/gitlab-ce!26430

(cherry picked from commit 79a45f7f)
parent 02b29ce8
...@@ -9,9 +9,6 @@ plugins: ...@@ -9,9 +9,6 @@ plugins:
- import - import
- html - html
settings: settings:
html/html-extensions:
- '.html'
- '.html.raw'
import/resolver: import/resolver:
webpack: webpack:
config: './config/webpack.config.js' config: './config/webpack.config.js'
......
...@@ -110,7 +110,7 @@ module.exports = function(config) { ...@@ -110,7 +110,7 @@ module.exports = function(config) {
frameworks: ['jasmine'], frameworks: ['jasmine'],
files: [ files: [
{ pattern: 'spec/javascripts/test_bundle.js', watched: false }, { pattern: 'spec/javascripts/test_bundle.js', watched: false },
{ pattern: 'spec/javascripts/fixtures/**/*@(.json|.html|.html.raw|.png)', included: false }, { pattern: 'spec/javascripts/fixtures/**/*@(.json|.html|.png)', included: false },
], ],
preprocessors: { preprocessors: {
'spec/javascripts/**/*.js': ['webpack', 'sourcemap'], 'spec/javascripts/**/*.js': ['webpack', 'sourcemap'],
......
...@@ -7,7 +7,7 @@ import Pager from '~/pager'; ...@@ -7,7 +7,7 @@ import Pager from '~/pager';
describe('Activities', () => { describe('Activities', () => {
window.gon || (window.gon = {}); window.gon || (window.gon = {});
const fixtureTemplate = 'static/event_filter.html.raw'; const fixtureTemplate = 'static/event_filter.html';
const filters = [ const filters = [
{ {
id: 'all', id: 'all',
......
...@@ -2,7 +2,7 @@ import $ from 'jquery'; ...@@ -2,7 +2,7 @@ import $ from 'jquery';
import AjaxLoadingSpinner from '~/ajax_loading_spinner'; import AjaxLoadingSpinner from '~/ajax_loading_spinner';
describe('Ajax Loading Spinner', () => { describe('Ajax Loading Spinner', () => {
const fixtureTemplate = 'static/ajax_loading_spinner.html.raw'; const fixtureTemplate = 'static/ajax_loading_spinner.html';
preloadFixtures(fixtureTemplate); preloadFixtures(fixtureTemplate);
beforeEach(() => { beforeEach(() => {
......
...@@ -24,13 +24,13 @@ const lazyAssert = function(done, assertFn) { ...@@ -24,13 +24,13 @@ const lazyAssert = function(done, assertFn) {
describe('AwardsHandler', function() { describe('AwardsHandler', function() {
const emojiData = getJSONFixture('emojis/emojis.json'); const emojiData = getJSONFixture('emojis/emojis.json');
preloadFixtures('snippets/show.html.raw'); preloadFixtures('snippets/show.html');
beforeEach(function(done) { beforeEach(function(done) {
mock = new MockAdapter(axios); mock = new MockAdapter(axios);
mock.onGet(`/-/emojis/${EMOJI_VERSION}/emojis.json`).reply(200, emojiData); mock.onGet(`/-/emojis/${EMOJI_VERSION}/emojis.json`).reply(200, emojiData);
loadFixtures('snippets/show.html.raw'); loadFixtures('snippets/show.html');
loadAwardsHandler(true) loadAwardsHandler(true)
.then(obj => { .then(obj => {
awardsHandler = obj; awardsHandler = obj;
......
...@@ -4,10 +4,10 @@ import '~/behaviors/quick_submit'; ...@@ -4,10 +4,10 @@ import '~/behaviors/quick_submit';
describe('Quick Submit behavior', function() { describe('Quick Submit behavior', function() {
const keydownEvent = (options = { keyCode: 13, metaKey: true }) => $.Event('keydown', options); const keydownEvent = (options = { keyCode: 13, metaKey: true }) => $.Event('keydown', options);
preloadFixtures('snippets/show.html.raw'); preloadFixtures('snippets/show.html');
beforeEach(() => { beforeEach(() => {
loadFixtures('snippets/show.html.raw'); loadFixtures('snippets/show.html');
$('form').submit(e => { $('form').submit(e => {
// Prevent a form submit from moving us off the testing page // Prevent a form submit from moving us off the testing page
e.preventDefault(); e.preventDefault();
......
...@@ -3,10 +3,10 @@ import '~/behaviors/requires_input'; ...@@ -3,10 +3,10 @@ import '~/behaviors/requires_input';
describe('requiresInput', () => { describe('requiresInput', () => {
let submitButton; let submitButton;
preloadFixtures('branches/new_branch.html.raw'); preloadFixtures('branches/new_branch.html');
beforeEach(() => { beforeEach(() => {
loadFixtures('branches/new_branch.html.raw'); loadFixtures('branches/new_branch.html');
submitButton = $('button[type="submit"]'); submitButton = $('button[type="submit"]');
}); });
......
...@@ -9,7 +9,7 @@ import ShortcutsIssuable from '~/behaviors/shortcuts/shortcuts_issuable'; ...@@ -9,7 +9,7 @@ import ShortcutsIssuable from '~/behaviors/shortcuts/shortcuts_issuable';
const FORM_SELECTOR = '.js-main-target-form .js-vue-comment-form'; const FORM_SELECTOR = '.js-main-target-form .js-vue-comment-form';
describe('ShortcutsIssuable', function() { describe('ShortcutsIssuable', function() {
const fixtureName = 'snippets/show.html.raw'; const fixtureName = 'snippets/show.html';
preloadFixtures(fixtureName); preloadFixtures(fixtureName);
beforeAll(done => { beforeAll(done => {
......
...@@ -6,10 +6,10 @@ describe('Balsamiq integration spec', () => { ...@@ -6,10 +6,10 @@ describe('Balsamiq integration spec', () => {
let endpoint; let endpoint;
let balsamiqViewer; let balsamiqViewer;
preloadFixtures('static/balsamiq_viewer.html.raw'); preloadFixtures('static/balsamiq_viewer.html');
beforeEach(() => { beforeEach(() => {
loadFixtures('static/balsamiq_viewer.html.raw'); loadFixtures('static/balsamiq_viewer.html');
container = document.getElementById('js-balsamiq-viewer'); container = document.getElementById('js-balsamiq-viewer');
balsamiqViewer = new BalsamiqViewer(container); balsamiqViewer = new BalsamiqViewer(container);
......
...@@ -2,10 +2,10 @@ import $ from 'jquery'; ...@@ -2,10 +2,10 @@ import $ from 'jquery';
import BlobFileDropzone from '~/blob/blob_file_dropzone'; import BlobFileDropzone from '~/blob/blob_file_dropzone';
describe('BlobFileDropzone', function() { describe('BlobFileDropzone', function() {
preloadFixtures('blob/show.html.raw'); preloadFixtures('blob/show.html');
beforeEach(() => { beforeEach(() => {
loadFixtures('blob/show.html.raw'); loadFixtures('blob/show.html');
const form = $('.js-upload-blob-form'); const form = $('.js-upload-blob-form');
this.blobFileDropzone = new BlobFileDropzone(form, 'POST'); this.blobFileDropzone = new BlobFileDropzone(form, 'POST');
this.dropzone = $('.js-upload-blob-form .dropzone').get(0).dropzone; this.dropzone = $('.js-upload-blob-form .dropzone').get(0).dropzone;
......
...@@ -3,10 +3,10 @@ import axios from '~/lib/utils/axios_utils'; ...@@ -3,10 +3,10 @@ import axios from '~/lib/utils/axios_utils';
import renderNotebook from '~/blob/notebook'; import renderNotebook from '~/blob/notebook';
describe('iPython notebook renderer', () => { describe('iPython notebook renderer', () => {
preloadFixtures('static/notebook_viewer.html.raw'); preloadFixtures('static/notebook_viewer.html');
beforeEach(() => { beforeEach(() => {
loadFixtures('static/notebook_viewer.html.raw'); loadFixtures('static/notebook_viewer.html');
}); });
it('shows loading icon', () => { it('shows loading icon', () => {
......
...@@ -15,10 +15,10 @@ describe('PDF renderer', () => { ...@@ -15,10 +15,10 @@ describe('PDF renderer', () => {
} }
}; };
preloadFixtures('static/pdf_viewer.html.raw'); preloadFixtures('static/pdf_viewer.html');
beforeEach(() => { beforeEach(() => {
loadFixtures('static/pdf_viewer.html.raw'); loadFixtures('static/pdf_viewer.html');
viewer = document.getElementById('js-pdf-viewer'); viewer = document.getElementById('js-pdf-viewer');
viewer.dataset.endpoint = testPDF; viewer.dataset.endpoint = testPDF;
}); });
......
...@@ -13,10 +13,10 @@ describe('Sketch viewer', () => { ...@@ -13,10 +13,10 @@ describe('Sketch viewer', () => {
}); });
}; };
preloadFixtures('static/sketch_viewer.html.raw'); preloadFixtures('static/sketch_viewer.html');
beforeEach(() => { beforeEach(() => {
loadFixtures('static/sketch_viewer.html.raw'); loadFixtures('static/sketch_viewer.html');
}); });
describe('with error message', () => { describe('with error message', () => {
......
...@@ -9,12 +9,12 @@ describe('Blob viewer', () => { ...@@ -9,12 +9,12 @@ describe('Blob viewer', () => {
let blob; let blob;
let mock; let mock;
preloadFixtures('snippets/show.html.raw'); preloadFixtures('snippets/show.html');
beforeEach(() => { beforeEach(() => {
mock = new MockAdapter(axios); mock = new MockAdapter(axios);
loadFixtures('snippets/show.html.raw'); loadFixtures('snippets/show.html');
$('#modal-upload-blob').remove(); $('#modal-upload-blob').remove();
blob = new BlobViewer(); blob = new BlobViewer();
......
...@@ -9,7 +9,7 @@ describe('Board component', () => { ...@@ -9,7 +9,7 @@ describe('Board component', () => {
let el; let el;
beforeEach(done => { beforeEach(done => {
loadFixtures('boards/show.html.raw'); loadFixtures('boards/show.html');
el = document.createElement('div'); el = document.createElement('div');
document.body.appendChild(el); document.body.appendChild(el);
......
import LinkedTabs from '~/lib/utils/bootstrap_linked_tabs'; import LinkedTabs from '~/lib/utils/bootstrap_linked_tabs';
describe('Linked Tabs', () => { describe('Linked Tabs', () => {
preloadFixtures('static/linked_tabs.html.raw'); preloadFixtures('static/linked_tabs.html');
beforeEach(() => { beforeEach(() => {
loadFixtures('static/linked_tabs.html.raw'); loadFixtures('static/linked_tabs.html');
}); });
describe('when is initialized', () => { describe('when is initialized', () => {
......
...@@ -7,8 +7,8 @@ const VARIABLE_PATCH_ENDPOINT = 'http://test.host/frontend-fixtures/builds-proje ...@@ -7,8 +7,8 @@ const VARIABLE_PATCH_ENDPOINT = 'http://test.host/frontend-fixtures/builds-proje
const HIDE_CLASS = 'hide'; const HIDE_CLASS = 'hide';
describe('AjaxFormVariableList', () => { describe('AjaxFormVariableList', () => {
preloadFixtures('projects/ci_cd_settings.html.raw'); preloadFixtures('projects/ci_cd_settings.html');
preloadFixtures('projects/ci_cd_settings_with_variables.html.raw'); preloadFixtures('projects/ci_cd_settings_with_variables.html');
let container; let container;
let saveButton; let saveButton;
...@@ -18,7 +18,7 @@ describe('AjaxFormVariableList', () => { ...@@ -18,7 +18,7 @@ describe('AjaxFormVariableList', () => {
let ajaxVariableList; let ajaxVariableList;
beforeEach(() => { beforeEach(() => {
loadFixtures('projects/ci_cd_settings.html.raw'); loadFixtures('projects/ci_cd_settings.html');
container = document.querySelector('.js-ci-variable-list-section'); container = document.querySelector('.js-ci-variable-list-section');
mock = new MockAdapter(axios); mock = new MockAdapter(axios);
...@@ -168,7 +168,7 @@ describe('AjaxFormVariableList', () => { ...@@ -168,7 +168,7 @@ describe('AjaxFormVariableList', () => {
describe('updateRowsWithPersistedVariables', () => { describe('updateRowsWithPersistedVariables', () => {
beforeEach(() => { beforeEach(() => {
loadFixtures('projects/ci_cd_settings_with_variables.html.raw'); loadFixtures('projects/ci_cd_settings_with_variables.html');
container = document.querySelector('.js-ci-variable-list-section'); container = document.querySelector('.js-ci-variable-list-section');
const ajaxVariableListEl = document.querySelector('.js-ci-variable-list-section'); const ajaxVariableListEl = document.querySelector('.js-ci-variable-list-section');
......
...@@ -5,9 +5,9 @@ import getSetTimeoutPromise from 'spec/helpers/set_timeout_promise_helper'; ...@@ -5,9 +5,9 @@ import getSetTimeoutPromise from 'spec/helpers/set_timeout_promise_helper';
const HIDE_CLASS = 'hide'; const HIDE_CLASS = 'hide';
describe('VariableList', () => { describe('VariableList', () => {
preloadFixtures('pipeline_schedules/edit.html.raw'); preloadFixtures('pipeline_schedules/edit.html');
preloadFixtures('pipeline_schedules/edit_with_variables.html.raw'); preloadFixtures('pipeline_schedules/edit_with_variables.html');
preloadFixtures('projects/ci_cd_settings.html.raw'); preloadFixtures('projects/ci_cd_settings.html');
let $wrapper; let $wrapper;
let variableList; let variableList;
...@@ -15,7 +15,7 @@ describe('VariableList', () => { ...@@ -15,7 +15,7 @@ describe('VariableList', () => {
describe('with only key/value inputs', () => { describe('with only key/value inputs', () => {
describe('with no variables', () => { describe('with no variables', () => {
beforeEach(() => { beforeEach(() => {
loadFixtures('pipeline_schedules/edit.html.raw'); loadFixtures('pipeline_schedules/edit.html');
$wrapper = $('.js-ci-variable-list-section'); $wrapper = $('.js-ci-variable-list-section');
variableList = new VariableList({ variableList = new VariableList({
...@@ -82,7 +82,7 @@ describe('VariableList', () => { ...@@ -82,7 +82,7 @@ describe('VariableList', () => {
describe('with persisted variables', () => { describe('with persisted variables', () => {
beforeEach(() => { beforeEach(() => {
loadFixtures('pipeline_schedules/edit_with_variables.html.raw'); loadFixtures('pipeline_schedules/edit_with_variables.html');
$wrapper = $('.js-ci-variable-list-section'); $wrapper = $('.js-ci-variable-list-section');
variableList = new VariableList({ variableList = new VariableList({
...@@ -115,7 +115,7 @@ describe('VariableList', () => { ...@@ -115,7 +115,7 @@ describe('VariableList', () => {
describe('with all inputs(key, value, protected)', () => { describe('with all inputs(key, value, protected)', () => {
beforeEach(() => { beforeEach(() => {
loadFixtures('projects/ci_cd_settings.html.raw'); loadFixtures('projects/ci_cd_settings.html');
$wrapper = $('.js-ci-variable-list-section'); $wrapper = $('.js-ci-variable-list-section');
$wrapper.find('.js-ci-variable-input-protected').attr('data-default', 'false'); $wrapper.find('.js-ci-variable-input-protected').attr('data-default', 'false');
...@@ -149,7 +149,7 @@ describe('VariableList', () => { ...@@ -149,7 +149,7 @@ describe('VariableList', () => {
describe('toggleEnableRow method', () => { describe('toggleEnableRow method', () => {
beforeEach(() => { beforeEach(() => {
loadFixtures('pipeline_schedules/edit_with_variables.html.raw'); loadFixtures('pipeline_schedules/edit_with_variables.html');
$wrapper = $('.js-ci-variable-list-section'); $wrapper = $('.js-ci-variable-list-section');
variableList = new VariableList({ variableList = new VariableList({
...@@ -198,7 +198,7 @@ describe('VariableList', () => { ...@@ -198,7 +198,7 @@ describe('VariableList', () => {
describe('hideValues', () => { describe('hideValues', () => {
beforeEach(() => { beforeEach(() => {
loadFixtures('projects/ci_cd_settings.html.raw'); loadFixtures('projects/ci_cd_settings.html');
$wrapper = $('.js-ci-variable-list-section'); $wrapper = $('.js-ci-variable-list-section');
variableList = new VariableList({ variableList = new VariableList({
......
...@@ -2,12 +2,12 @@ import $ from 'jquery'; ...@@ -2,12 +2,12 @@ import $ from 'jquery';
import setupNativeFormVariableList from '~/ci_variable_list/native_form_variable_list'; import setupNativeFormVariableList from '~/ci_variable_list/native_form_variable_list';
describe('NativeFormVariableList', () => { describe('NativeFormVariableList', () => {
preloadFixtures('pipeline_schedules/edit.html.raw'); preloadFixtures('pipeline_schedules/edit.html');
let $wrapper; let $wrapper;
beforeEach(() => { beforeEach(() => {
loadFixtures('pipeline_schedules/edit.html.raw'); loadFixtures('pipeline_schedules/edit.html');
$wrapper = $('.js-ci-variable-list-section'); $wrapper = $('.js-ci-variable-list-section');
setupNativeFormVariableList({ setupNativeFormVariableList({
......
...@@ -9,10 +9,10 @@ import getSetTimeoutPromise from 'spec/helpers/set_timeout_promise_helper'; ...@@ -9,10 +9,10 @@ import getSetTimeoutPromise from 'spec/helpers/set_timeout_promise_helper';
describe('Clusters', () => { describe('Clusters', () => {
let cluster; let cluster;
preloadFixtures('clusters/show_cluster.html.raw'); preloadFixtures('clusters/show_cluster.html');
beforeEach(() => { beforeEach(() => {
loadFixtures('clusters/show_cluster.html.raw'); loadFixtures('clusters/show_cluster.html');
cluster = new Clusters(); cluster = new Clusters();
}); });
......
...@@ -6,7 +6,7 @@ import Sidebar from '~/right_sidebar'; ...@@ -6,7 +6,7 @@ import Sidebar from '~/right_sidebar';
import timeoutPromise from './helpers/set_timeout_promise_helper'; import timeoutPromise from './helpers/set_timeout_promise_helper';
describe('Issuable right sidebar collapsed todo toggle', () => { describe('Issuable right sidebar collapsed todo toggle', () => {
const fixtureName = 'issues/open-issue.html.raw'; const fixtureName = 'issues/open-issue.html';
const jsonFixtureName = 'todos/todos.json'; const jsonFixtureName = 'todos/todos.json';
let mock; let mock;
......
...@@ -20,7 +20,7 @@ const DROPDOWN_ITEM_DATA = [ ...@@ -20,7 +20,7 @@ const DROPDOWN_ITEM_DATA = [
]; ];
describe('CreateItemDropdown', () => { describe('CreateItemDropdown', () => {
preloadFixtures('static/create_item_dropdown.html.raw'); preloadFixtures('static/create_item_dropdown.html');
let $wrapperEl; let $wrapperEl;
let createItemDropdown; let createItemDropdown;
...@@ -44,7 +44,7 @@ describe('CreateItemDropdown', () => { ...@@ -44,7 +44,7 @@ describe('CreateItemDropdown', () => {
} }
beforeEach(() => { beforeEach(() => {
loadFixtures('static/create_item_dropdown.html.raw'); loadFixtures('static/create_item_dropdown.html');
$wrapperEl = $('.js-create-item-dropdown-fixture-root'); $wrapperEl = $('.js-create-item-dropdown-fixture-root');
}); });
......
...@@ -72,7 +72,7 @@ describe('Dropdown User', () => { ...@@ -72,7 +72,7 @@ describe('Dropdown User', () => {
}); });
describe('hideCurrentUser', () => { describe('hideCurrentUser', () => {
const fixtureTemplate = 'issues/issue_list.html.raw'; const fixtureTemplate = 'issues/issue_list.html';
preloadFixtures(fixtureTemplate); preloadFixtures(fixtureTemplate);
let dropdown; let dropdown;
......
...@@ -4,7 +4,7 @@ import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered ...@@ -4,7 +4,7 @@ import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered
import FilteredSearchSpecHelper from '../helpers/filtered_search_spec_helper'; import FilteredSearchSpecHelper from '../helpers/filtered_search_spec_helper';
describe('Dropdown Utils', () => { describe('Dropdown Utils', () => {
const issueListFixture = 'issues/issue_list.html.raw'; const issueListFixture = 'issues/issue_list.html';
preloadFixtures(issueListFixture); preloadFixtures(issueListFixture);
describe('getEscapedText', () => { describe('getEscapedText', () => {
......
*.html.raw *.html.raw
*.html
*.json *.json
...@@ -18,7 +18,7 @@ describe Admin::AbuseReportsController, '(JavaScript fixtures)', type: :controll ...@@ -18,7 +18,7 @@ describe Admin::AbuseReportsController, '(JavaScript fixtures)', type: :controll
sign_in(admin) sign_in(admin)
end end
it 'abuse_reports/abuse_reports_list.html.raw' do |example| it 'abuse_reports/abuse_reports_list.html' do |example|
get :index get :index
expect(response).to be_success expect(response).to be_success
......
...@@ -17,7 +17,7 @@ describe Admin::UsersController, '(JavaScript fixtures)', type: :controller do ...@@ -17,7 +17,7 @@ describe Admin::UsersController, '(JavaScript fixtures)', type: :controller do
clean_frontend_fixtures('admin/users') clean_frontend_fixtures('admin/users')
end end
it 'admin/users/new_with_internal_user_regex.html.raw' do |example| it 'admin/users/new_with_internal_user_regex.html' do |example|
stub_application_setting(user_default_external: true) stub_application_setting(user_default_external: true)
stub_application_setting(user_default_internal_regex: '^(?:(?!\.ext@).)*$\r?') stub_application_setting(user_default_internal_regex: '^(?:(?!\.ext@).)*$\r?')
......
...@@ -23,7 +23,7 @@ describe Admin::ApplicationSettingsController, '(JavaScript fixtures)', type: :c ...@@ -23,7 +23,7 @@ describe Admin::ApplicationSettingsController, '(JavaScript fixtures)', type: :c
remove_repository(project) remove_repository(project)
end end
it 'application_settings/accounts_and_limit.html.raw' do |example| it 'application_settings/accounts_and_limit.html' do |example|
stub_application_setting(user_default_external: false) stub_application_setting(user_default_external: false)
get :show get :show
......
...@@ -22,7 +22,7 @@ describe Projects::BlobController, '(JavaScript fixtures)', type: :controller do ...@@ -22,7 +22,7 @@ describe Projects::BlobController, '(JavaScript fixtures)', type: :controller do
remove_repository(project) remove_repository(project)
end end
it 'blob/show.html.raw' do |example| it 'blob/show.html' do |example|
get(:show, params: { get(:show, params: {
namespace_id: project.namespace, namespace_id: project.namespace,
project_id: project, project_id: project,
......
...@@ -17,7 +17,7 @@ describe Projects::BoardsController, '(JavaScript fixtures)', type: :controller ...@@ -17,7 +17,7 @@ describe Projects::BoardsController, '(JavaScript fixtures)', type: :controller
sign_in(admin) sign_in(admin)
end end
it 'boards/show.html.raw' do |example| it 'boards/show.html' do |example|
get(:index, params: { get(:index, params: {
namespace_id: project.namespace, namespace_id: project.namespace,
project_id: project project_id: project
......
...@@ -21,7 +21,7 @@ describe Projects::BranchesController, '(JavaScript fixtures)', type: :controlle ...@@ -21,7 +21,7 @@ describe Projects::BranchesController, '(JavaScript fixtures)', type: :controlle
remove_repository(project) remove_repository(project)
end end
it 'branches/new_branch.html.raw' do |example| it 'branches/new_branch.html' do |example|
get :new, params: { get :new, params: {
namespace_id: project.namespace.to_param, namespace_id: project.namespace.to_param,
project_id: project project_id: project
......
...@@ -22,7 +22,7 @@ describe Projects::ClustersController, '(JavaScript fixtures)', type: :controlle ...@@ -22,7 +22,7 @@ describe Projects::ClustersController, '(JavaScript fixtures)', type: :controlle
remove_repository(project) remove_repository(project)
end end
it 'clusters/show_cluster.html.raw' do |example| it 'clusters/show_cluster.html' do |example|
get :show, params: { get :show, params: {
namespace_id: project.namespace.to_param, namespace_id: project.namespace.to_param,
project_id: project, project_id: project,
......
...@@ -19,7 +19,7 @@ describe Projects::CommitController, '(JavaScript fixtures)', type: :controller ...@@ -19,7 +19,7 @@ describe Projects::CommitController, '(JavaScript fixtures)', type: :controller
allow(SecureRandom).to receive(:hex).and_return('securerandomhex:thereisnospoon') allow(SecureRandom).to receive(:hex).and_return('securerandomhex:thereisnospoon')
end end
it 'commit/show.html.raw' do |example| it 'commit/show.html' do |example|
params = { params = {
namespace_id: project.namespace, namespace_id: project.namespace,
project_id: project, project_id: project,
......
...@@ -18,7 +18,7 @@ describe 'Groups (JavaScript fixtures)', type: :controller do ...@@ -18,7 +18,7 @@ describe 'Groups (JavaScript fixtures)', type: :controller do
end end
describe GroupsController, '(JavaScript fixtures)', type: :controller do describe GroupsController, '(JavaScript fixtures)', type: :controller do