diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-12-30 18:14:33 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-05 14:11:07 -0600 |
| commit | 7a2a9bb45e681fdcd707fdbe3fbcc3ce2e17663c (patch) | |
| tree | 94981286ccd9cf5ba26684288994e3a50dd21866 /spec/javascripts/merge_request_spec.js | |
| parent | 10d483eaaaccc336399fa83a0ac5f7ecd9cea352 (diff) | |
| download | gitlab-ce-7a2a9bb45e681fdcd707fdbe3fbcc3ce2e17663c.tar.gz | |
replace Teaspoon fixture methods with jasmine-jquery methods to reduce dependency on Teaspoon
Diffstat (limited to 'spec/javascripts/merge_request_spec.js')
| -rw-r--r-- | spec/javascripts/merge_request_spec.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/merge_request_spec.js b/spec/javascripts/merge_request_spec.js index 68afb4af3c1..9b232617fe5 100644 --- a/spec/javascripts/merge_request_spec.js +++ b/spec/javascripts/merge_request_spec.js @@ -6,9 +6,9 @@ (function() { describe('MergeRequest', function() { return describe('task lists', function() { - fixture.preload('static/merge_requests_show.html.raw'); + preloadFixtures('static/merge_requests_show.html.raw'); beforeEach(function() { - fixture.load('static/merge_requests_show.html.raw'); + loadFixtures('static/merge_requests_show.html.raw'); return this.merge = new MergeRequest(); }); it('modifies the Markdown field', function() { |