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/gl_dropdown_spec.js.es6 | |
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/gl_dropdown_spec.js.es6')
-rw-r--r-- | spec/javascripts/gl_dropdown_spec.js.es6 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/spec/javascripts/gl_dropdown_spec.js.es6 b/spec/javascripts/gl_dropdown_spec.js.es6 index 5f9359007ac..ce96571bd52 100644 --- a/spec/javascripts/gl_dropdown_spec.js.es6 +++ b/spec/javascripts/gl_dropdown_spec.js.es6 @@ -43,8 +43,7 @@ } describe('Dropdown', function describeDropdown() { - fixture.preload('static/gl_dropdown.html.raw'); - fixture.preload('projects.json'); + preloadFixtures('static/gl_dropdown.html.raw'); function initDropDown(hasRemote, isFilterable) { this.dropdownButtonElement = $('#js-project-dropdown', this.dropdownContainerElement).glDropdown({ @@ -61,10 +60,10 @@ } beforeEach(() => { - fixture.load('static/gl_dropdown.html.raw'); + loadFixtures('static/gl_dropdown.html.raw'); this.dropdownContainerElement = $('.dropdown.inline'); this.$dropdownMenuElement = $('.dropdown-menu', this.dropdownContainerElement); - this.projectsData = fixture.load('projects.json')[0]; + this.projectsData = getJSONFixture('projects.json'); }); afterEach(() => { |