summaryrefslogtreecommitdiff
path: root/spec/javascripts/right_sidebar_spec.js
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2016-12-30 18:14:33 -0600
committerMike Greiling <mike@pixelcog.com>2017-01-05 14:11:07 -0600
commit7a2a9bb45e681fdcd707fdbe3fbcc3ce2e17663c (patch)
tree94981286ccd9cf5ba26684288994e3a50dd21866 /spec/javascripts/right_sidebar_spec.js
parent10d483eaaaccc336399fa83a0ac5f7ecd9cea352 (diff)
downloadgitlab-ce-7a2a9bb45e681fdcd707fdbe3fbcc3ce2e17663c.tar.gz
replace Teaspoon fixture methods with jasmine-jquery methods to reduce dependency on Teaspoon
Diffstat (limited to 'spec/javascripts/right_sidebar_spec.js')
-rw-r--r--spec/javascripts/right_sidebar_spec.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/javascripts/right_sidebar_spec.js b/spec/javascripts/right_sidebar_spec.js
index a083dbf033a..b2ee0ce5963 100644
--- a/spec/javascripts/right_sidebar_spec.js
+++ b/spec/javascripts/right_sidebar_spec.js
@@ -36,9 +36,9 @@
describe('RightSidebar', function() {
var fixtureName = 'issues/open-issue.html.raw';
- fixture.preload(fixtureName);
+ preloadFixtures(fixtureName);
beforeEach(function() {
- fixture.load(fixtureName);
+ loadFixtures(fixtureName);
this.sidebar = new Sidebar;
$aside = $('.right-sidebar');
$page = $('.page-with-sidebar');
@@ -67,7 +67,7 @@
it('should broadcast todo:toggle event when add todo clicked', function() {
spyOn(jQuery, 'ajax').and.callFake(function() {
var d = $.Deferred();
- var response = fixture.load('todos.json');
+ var response = getJSONFixture('todos.json');
d.resolve(response);
return d.promise();
});