summaryrefslogtreecommitdiff
path: root/spec/javascripts/notes_spec.js
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2017-01-06 16:12:59 +0000
committerAlfredo Sumaran <alfredo@gitlab.com>2017-01-06 16:12:59 +0000
commit57652bf58482dd1b4ac26b5f804d3d4ece6591d8 (patch)
tree01b907268b022696d33b1d64471e53c20e87a974 /spec/javascripts/notes_spec.js
parent729636bdc6eda769ad5e8eda48a6ed722e854cd7 (diff)
parentf19330e4fbef7f893af86c6e9b06d3378c3ef936 (diff)
downloadgitlab-ce-57652bf58482dd1b4ac26b5f804d3d4ece6591d8.tar.gz
Merge branch '26226-generate-all-haml-fixtures-within-teaspoon-fixtures-task' into 'master'
Precompile all frontend test fixtures Closes #26226 See merge request !8384
Diffstat (limited to 'spec/javascripts/notes_spec.js')
-rw-r--r--spec/javascripts/notes_spec.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/javascripts/notes_spec.js b/spec/javascripts/notes_spec.js
index bb13af7ac0c..9cdb0a5d5aa 100644
--- a/spec/javascripts/notes_spec.js
+++ b/spec/javascripts/notes_spec.js
@@ -12,11 +12,11 @@
gl.utils = gl.utils || {};
describe('Notes', function() {
- var commentsTemplate = 'issues/issue_with_comment.raw';
- fixture.preload(commentsTemplate);
+ var commentsTemplate = 'issues/issue_with_comment.html.raw';
+ preloadFixtures(commentsTemplate);
beforeEach(function () {
- fixture.load(commentsTemplate);
+ loadFixtures(commentsTemplate);
gl.utils.disableButtonIfEmptyField = _.noop;
window.project_uploads_path = 'http://test.host/uploads';
$('body').data('page', 'projects:issues:show');