summaryrefslogtreecommitdiff
path: root/spec/javascripts/environments
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/environments
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/environments')
-rw-r--r--spec/javascripts/environments/environment_actions_spec.js.es64
-rw-r--r--spec/javascripts/environments/environment_external_url_spec.js.es64
-rw-r--r--spec/javascripts/environments/environment_item_spec.js.es64
-rw-r--r--spec/javascripts/environments/environment_rollback_spec.js.es64
-rw-r--r--spec/javascripts/environments/environment_stop_spec.js.es64
5 files changed, 10 insertions, 10 deletions
diff --git a/spec/javascripts/environments/environment_actions_spec.js.es6 b/spec/javascripts/environments/environment_actions_spec.js.es6
index c2ac3523483..056e4d41e93 100644
--- a/spec/javascripts/environments/environment_actions_spec.js.es6
+++ b/spec/javascripts/environments/environment_actions_spec.js.es6
@@ -2,10 +2,10 @@
//= require environments/components/environment_actions
describe('Actions Component', () => {
- fixture.preload('static/environments/element.html.raw');
+ preloadFixtures('static/environments/element.html.raw');
beforeEach(() => {
- fixture.load('static/environments/element.html.raw');
+ loadFixtures('static/environments/element.html.raw');
});
it('should render a dropdown with the provided actions', () => {
diff --git a/spec/javascripts/environments/environment_external_url_spec.js.es6 b/spec/javascripts/environments/environment_external_url_spec.js.es6
index d578a017d44..950a5d53fad 100644
--- a/spec/javascripts/environments/environment_external_url_spec.js.es6
+++ b/spec/javascripts/environments/environment_external_url_spec.js.es6
@@ -2,9 +2,9 @@
//= require environments/components/environment_external_url
describe('External URL Component', () => {
- fixture.preload('static/environments/element.html.raw');
+ preloadFixtures('static/environments/element.html.raw');
beforeEach(() => {
- fixture.load('static/environments/element.html.raw');
+ loadFixtures('static/environments/element.html.raw');
});
it('should link to the provided externalUrl prop', () => {
diff --git a/spec/javascripts/environments/environment_item_spec.js.es6 b/spec/javascripts/environments/environment_item_spec.js.es6
index 7b53152108f..c178b9cc1ec 100644
--- a/spec/javascripts/environments/environment_item_spec.js.es6
+++ b/spec/javascripts/environments/environment_item_spec.js.es6
@@ -3,9 +3,9 @@
//= require environments/components/environment_item
describe('Environment item', () => {
- fixture.preload('static/environments/table.html.raw');
+ preloadFixtures('static/environments/table.html.raw');
beforeEach(() => {
- fixture.load('static/environments/table.html.raw');
+ loadFixtures('static/environments/table.html.raw');
});
describe('When item is folder', () => {
diff --git a/spec/javascripts/environments/environment_rollback_spec.js.es6 b/spec/javascripts/environments/environment_rollback_spec.js.es6
index bfa20d6f2e5..21241116e29 100644
--- a/spec/javascripts/environments/environment_rollback_spec.js.es6
+++ b/spec/javascripts/environments/environment_rollback_spec.js.es6
@@ -1,12 +1,12 @@
//= require vue
//= require environments/components/environment_rollback
describe('Rollback Component', () => {
- fixture.preload('static/environments/element.html.raw');
+ preloadFixtures('static/environments/element.html.raw');
const retryURL = 'https://gitlab.com/retry';
beforeEach(() => {
- fixture.load('static/environments/element.html.raw');
+ loadFixtures('static/environments/element.html.raw');
});
it('Should link to the provided retryUrl', () => {
diff --git a/spec/javascripts/environments/environment_stop_spec.js.es6 b/spec/javascripts/environments/environment_stop_spec.js.es6
index c3c5f2cc4c8..bb998a32f32 100644
--- a/spec/javascripts/environments/environment_stop_spec.js.es6
+++ b/spec/javascripts/environments/environment_stop_spec.js.es6
@@ -1,13 +1,13 @@
//= require vue
//= require environments/components/environment_stop
describe('Stop Component', () => {
- fixture.preload('static/environments/element.html.raw');
+ preloadFixtures('static/environments/element.html.raw');
let stopURL;
let component;
beforeEach(() => {
- fixture.load('static/environments/element.html.raw');
+ loadFixtures('static/environments/element.html.raw');
stopURL = '/stop';
component = new window.gl.environmentsList.StopComponent({