summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-10-19 15:53:11 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-10-19 15:53:11 +0000
commitcad56768d5f60f2d77f9b0a21a6f51ac517cbca9 (patch)
tree57315bc13db02182c0e0af97d9e62e7a1036b509
parentc316c8043038e93f893332354c2722d1188ebe73 (diff)
parente7763a58b509ea7607e2cd4f78e839efd78eb17b (diff)
downloadgitlab-ce-cad56768d5f60f2d77f9b0a21a6f51ac517cbca9.tar.gz
Merge branch 'gt-remove-empty-spec-describe-blocks' into 'master'
Remove empty spec describe blocks Closes #52842 See merge request gitlab-org/gitlab-ce!22451
-rw-r--r--changelogs/unreleased/gt-remove-empty-spec-describe-blocks.yml5
-rw-r--r--spec/javascripts/blob/balsamiq/balsamiq_viewer_spec.js2
-rw-r--r--spec/javascripts/ide/stores/actions_spec.js2
-rw-r--r--spec/javascripts/image_diff/image_diff_spec.js10
4 files changed, 5 insertions, 14 deletions
diff --git a/changelogs/unreleased/gt-remove-empty-spec-describe-blocks.yml b/changelogs/unreleased/gt-remove-empty-spec-describe-blocks.yml
new file mode 100644
index 00000000000..c1f7a2a40c7
--- /dev/null
+++ b/changelogs/unreleased/gt-remove-empty-spec-describe-blocks.yml
@@ -0,0 +1,5 @@
+---
+title: Remove empty spec describe blocks
+merge_request: 22451
+author: george Tsiolis
+type: other
diff --git a/spec/javascripts/blob/balsamiq/balsamiq_viewer_spec.js b/spec/javascripts/blob/balsamiq/balsamiq_viewer_spec.js
index 9270433dcb7..fd73fb4bfcc 100644
--- a/spec/javascripts/blob/balsamiq/balsamiq_viewer_spec.js
+++ b/spec/javascripts/blob/balsamiq/balsamiq_viewer_spec.js
@@ -18,8 +18,6 @@ describe('BalsamiqViewer', () => {
});
});
- describe('fileLoaded', () => {});
-
describe('loadFile', () => {
let xhr;
let loadFile;
diff --git a/spec/javascripts/ide/stores/actions_spec.js b/spec/javascripts/ide/stores/actions_spec.js
index c9a1158a14e..df291ade3f7 100644
--- a/spec/javascripts/ide/stores/actions_spec.js
+++ b/spec/javascripts/ide/stores/actions_spec.js
@@ -279,8 +279,6 @@ describe('Multi-file store actions', () => {
});
});
- describe('popHistoryState', () => {});
-
describe('scrollToTab', () => {
it('focuses the current active element', done => {
document.body.innerHTML +=
diff --git a/spec/javascripts/image_diff/image_diff_spec.js b/spec/javascripts/image_diff/image_diff_spec.js
index 9a7f288cd6b..21e7b8e2e9b 100644
--- a/spec/javascripts/image_diff/image_diff_spec.js
+++ b/spec/javascripts/image_diff/image_diff_spec.js
@@ -128,16 +128,6 @@ describe('ImageDiff', () => {
});
});
- describe('image loaded', () => {
- beforeEach(() => {
- spyOn(imageUtility, 'isImageLoaded').and.returnValue(true);
- imageDiff = new ImageDiff(element);
- imageDiff.imageEl = imageEl;
- });
-
- it('should renderBadges', () => {});
- });
-
describe('image not loaded', () => {
beforeEach(() => {
spyOn(imageUtility, 'isImageLoaded').and.returnValue(false);