summaryrefslogtreecommitdiff
path: root/spec/javascripts/behaviors
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/behaviors
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/behaviors')
-rw-r--r--spec/javascripts/behaviors/autosize_spec.js2
-rw-r--r--spec/javascripts/behaviors/quick_submit_spec.js4
-rw-r--r--spec/javascripts/behaviors/requires_input_spec.js4
3 files changed, 5 insertions, 5 deletions
diff --git a/spec/javascripts/behaviors/autosize_spec.js b/spec/javascripts/behaviors/autosize_spec.js
index b4573e53a4e..e77d732a32a 100644
--- a/spec/javascripts/behaviors/autosize_spec.js
+++ b/spec/javascripts/behaviors/autosize_spec.js
@@ -6,7 +6,7 @@
describe('Autosize behavior', function() {
var load;
beforeEach(function() {
- return fixture.set('<textarea class="js-autosize" style="resize: vertical"></textarea>');
+ return setFixtures('<textarea class="js-autosize" style="resize: vertical"></textarea>');
});
it('does not overwrite the resize property', function() {
load();
diff --git a/spec/javascripts/behaviors/quick_submit_spec.js b/spec/javascripts/behaviors/quick_submit_spec.js
index f4a977b9dea..1a1f34cfdc0 100644
--- a/spec/javascripts/behaviors/quick_submit_spec.js
+++ b/spec/javascripts/behaviors/quick_submit_spec.js
@@ -5,9 +5,9 @@
(function() {
describe('Quick Submit behavior', function() {
var keydownEvent;
- fixture.preload('static/behaviors/quick_submit.html.raw');
+ preloadFixtures('static/behaviors/quick_submit.html.raw');
beforeEach(function() {
- fixture.load('static/behaviors/quick_submit.html.raw');
+ loadFixtures('static/behaviors/quick_submit.html.raw');
$('form').submit(function(e) {
// Prevent a form submit from moving us off the testing page
return e.preventDefault();
diff --git a/spec/javascripts/behaviors/requires_input_spec.js b/spec/javascripts/behaviors/requires_input_spec.js
index 8b21551bd10..1f62591c06d 100644
--- a/spec/javascripts/behaviors/requires_input_spec.js
+++ b/spec/javascripts/behaviors/requires_input_spec.js
@@ -4,9 +4,9 @@
(function() {
describe('requiresInput', function() {
- fixture.preload('static/behaviors/requires_input.html.raw');
+ preloadFixtures('static/behaviors/requires_input.html.raw');
beforeEach(function() {
- return fixture.load('static/behaviors/requires_input.html.raw');
+ return loadFixtures('static/behaviors/requires_input.html.raw');
});
it('disables submit when any field is required', function() {
$('.js-requires-input').requiresInput();