summaryrefslogtreecommitdiff
path: root/spec/javascripts/pipelines/pipelines_spec.js
diff options
context:
space:
mode:
authorConstance Okoghenun <constanceokoghenun@gmail.com>2018-11-05 10:33:05 +0100
committerConstance Okoghenun <constanceokoghenun@gmail.com>2018-11-05 10:33:05 +0100
commit3bac1a322c82dd9b6e9b23edd66fa45afaa9859f (patch)
treed3e7d47a3e0c8047cb2972aefbc12fe1e3080ef8 /spec/javascripts/pipelines/pipelines_spec.js
parentfe7b6f57120946a5d5fe4a4d54a245dc76b06dc8 (diff)
parent9e2eb85e365e2a33e52e3f1f48cc23ad4201a52b (diff)
downloadgitlab-ce-issue_51323.tar.gz
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_51323issue_51323
Diffstat (limited to 'spec/javascripts/pipelines/pipelines_spec.js')
-rw-r--r--spec/javascripts/pipelines/pipelines_spec.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/pipelines/pipelines_spec.js b/spec/javascripts/pipelines/pipelines_spec.js
index 37908153e0e..97ded16db69 100644
--- a/spec/javascripts/pipelines/pipelines_spec.js
+++ b/spec/javascripts/pipelines/pipelines_spec.js
@@ -372,7 +372,7 @@ describe('Pipelines', () => {
});
});
- describe('successfull request', () => {
+ describe('successful request', () => {
describe('with pipelines', () => {
beforeEach(() => {
mock.onGet('twitter/flight/pipelines.json').reply(200, pipelines);
@@ -667,7 +667,7 @@ describe('Pipelines', () => {
});
});
- it('returns false when state is emtpy state', done => {
+ it('returns false when state is empty state', done => {
vm.isLoading = false;
vm.hasMadeRequest = true;
vm.hasGitlabCi = false;