summaryrefslogtreecommitdiff
path: root/spec/javascripts/pipelines
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-01-17 11:30:25 +0000
committerNick Thomas <nick@gitlab.com>2018-01-24 17:25:55 +0000
commit93ea3234dfaa43204c5f24d4010bbe5070d75c72 (patch)
treedab7e978b28b6dc79349a3e084fad36175cf55d7 /spec/javascripts/pipelines
parent5a4fb8f0d183c7dd1560c90e750a7a37141c22d4 (diff)
downloadgitlab-ce-93ea3234dfaa43204c5f24d4010bbe5070d75c72.tar.gz
Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'
Diffstat (limited to 'spec/javascripts/pipelines')
-rw-r--r--spec/javascripts/pipelines/pipelines_table_row_spec.js8
-rw-r--r--spec/javascripts/pipelines/pipelines_table_spec.js4
2 files changed, 6 insertions, 6 deletions
diff --git a/spec/javascripts/pipelines/pipelines_table_row_spec.js b/spec/javascripts/pipelines/pipelines_table_row_spec.js
index a9126d2f4e9..d5b9e68cc51 100644
--- a/spec/javascripts/pipelines/pipelines_table_row_spec.js
+++ b/spec/javascripts/pipelines/pipelines_table_row_spec.js
@@ -23,10 +23,10 @@ describe('Pipelines Table Row', () => {
preloadFixtures(jsonFixtureName);
beforeEach(() => {
- const pipelines = getJSONFixture(jsonFixtureName).pipelines;
- pipeline = pipelines.find(p => p.id === 1);
- pipelineWithoutAuthor = pipelines.find(p => p.id === 2);
- pipelineWithoutCommit = pipelines.find(p => p.id === 3);
+ const pipelines = getJSONFixture(jsonFixtureName).pipelines; // sorted by id, descending
+ pipeline = pipelines[2];
+ pipelineWithoutAuthor = pipelines[1];
+ pipelineWithoutCommit = pipelines[0];
});
afterEach(() => {
diff --git a/spec/javascripts/pipelines/pipelines_table_spec.js b/spec/javascripts/pipelines/pipelines_table_spec.js
index ca2f9163313..3e2dfce8e17 100644
--- a/spec/javascripts/pipelines/pipelines_table_spec.js
+++ b/spec/javascripts/pipelines/pipelines_table_spec.js
@@ -12,8 +12,8 @@ describe('Pipelines Table', () => {
beforeEach(() => {
PipelinesTableComponent = Vue.extend(pipelinesTableComp);
- const pipelines = getJSONFixture(jsonFixtureName).pipelines;
- pipeline = pipelines.find(p => p.id === 1);
+ const pipelines = getJSONFixture(jsonFixtureName).pipelines; // ordered by id, descending
+ pipeline = pipelines[2];
});
describe('table', () => {