summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2015-12-23 20:57:16 -0500
committerJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2015-12-23 20:57:16 -0500
commit00e967a07f476f7df7aaddc652258668af392f5d (patch)
tree31081b11bba2fb0bd248c0b0aa47151748a68864
parente11ee5ff01bf031cd4fda377a7444f2ba4d50f40 (diff)
downloadgitlab-ce-00e967a07f476f7df7aaddc652258668af392f5d.tar.gz
removes unused `alert` from issue spec. Requires flash in the *implementation* instead of the spec.close-open-ajax-issue
-rw-r--r--app/assets/javascripts/issue.js.coffee1
-rw-r--r--spec/javascripts/fixtures/issues_show.html.haml9
-rw-r--r--spec/javascripts/issue_spec.js.coffee1
3 files changed, 3 insertions, 8 deletions
diff --git a/app/assets/javascripts/issue.js.coffee b/app/assets/javascripts/issue.js.coffee
index 3d9d514a9c7..c256ec8f41b 100644
--- a/app/assets/javascripts/issue.js.coffee
+++ b/app/assets/javascripts/issue.js.coffee
@@ -1,3 +1,4 @@
+#= require flash
#= require jquery.waitforimages
#= require task_list
diff --git a/spec/javascripts/fixtures/issues_show.html.haml b/spec/javascripts/fixtures/issues_show.html.haml
index dd01b6378c5..470cabeafbb 100644
--- a/spec/javascripts/fixtures/issues_show.html.haml
+++ b/spec/javascripts/fixtures/issues_show.html.haml
@@ -2,13 +2,8 @@
.hidden { display: none !important; }
.flash-container
- - if alert
- .flash-alert
- = alert
-
- - elsif notice
- .flash-notice
- = notice
+ .flash-alert
+ .flash-notice
.status-box.status-box-open Open
.status-box.status-box-closed.hidden Closed
diff --git a/spec/javascripts/issue_spec.js.coffee b/spec/javascripts/issue_spec.js.coffee
index f0a57d99c56..7e67c778861 100644
--- a/spec/javascripts/issue_spec.js.coffee
+++ b/spec/javascripts/issue_spec.js.coffee
@@ -1,4 +1,3 @@
-#= require flash
#= require issue
describe 'Issue', ->