summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-07-07 11:25:04 +0100
committerPhil Hughes <me@iamphill.com>2016-07-08 14:10:32 +0100
commitbd888e135d5cd9d7e9ffb6c3a79fc2ce2f56770d (patch)
tree97f6f1c8be5f8938512259388738367b053730c4
parentd7450946a75a5e344bf996542114ab0499f6a7fa (diff)
downloadgitlab-ce-compare-dropdowns.tar.gz
Fixed submit button not enablingcompare-dropdowns
Fixed tests
-rw-r--r--app/assets/javascripts/gl_dropdown.js.coffee4
-rw-r--r--spec/features/compare_spec.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 5ffacf9a184..1b0d0db8954 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -518,7 +518,9 @@ class GitLabDropdown
if !field.length and fieldName
@addInput(fieldName, value)
else
- field.val value
+ field
+ .val value
+ .trigger 'change'
return selectedObject
diff --git a/spec/features/compare_spec.rb b/spec/features/compare_spec.rb
index faffe314912..c62556948e0 100644
--- a/spec/features/compare_spec.rb
+++ b/spec/features/compare_spec.rb
@@ -16,7 +16,7 @@ describe "Compare", js: true do
end
it "should compare branches" do
- fill_in "from", with: "mast"
+ fill_in "from", with: "fea"
find("#from").click
click_link "feature"