diff options
author | Luke Bennett <lbennett@gitlab.com> | 2019-03-14 20:52:01 +0000 |
---|---|---|
committer | Luke Bennett <lbennett@gitlab.com> | 2019-04-11 18:21:14 +0100 |
commit | b7f7638310e8a0069ad5f5038ba82b7aeddc2b07 (patch) | |
tree | 1ec9b09e6fb35230d8da06dab6445096a6572ddd /spec/support/shared_examples | |
parent | dc8848794bfd2f06345d4dbba8a918aa09ee07a8 (diff) | |
download | gitlab-ce-b7f7638310e8a0069ad5f5038ba82b7aeddc2b07.tar.gz |
Improve project settings page
Prioritize and simplify project settings content.
Diffstat (limited to 'spec/support/shared_examples')
-rw-r--r-- | spec/support/shared_examples/dirty_submit_form_shared_examples.rb | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/spec/support/shared_examples/dirty_submit_form_shared_examples.rb b/spec/support/shared_examples/dirty_submit_form_shared_examples.rb index 52a2ee49495..4e45e2921e7 100644 --- a/spec/support/shared_examples/dirty_submit_form_shared_examples.rb +++ b/spec/support/shared_examples/dirty_submit_form_shared_examples.rb @@ -1,18 +1,17 @@ shared_examples 'dirty submit form' do |selector_args| selectors = selector_args.is_a?(Array) ? selector_args : [selector_args] - def expect_disabled_state(form, submit, is_disabled = true) + def expect_disabled_state(form, submit_selector, is_disabled = true) disabled_selector = is_disabled == true ? '[disabled]' : ':not([disabled])' - form.find(".js-dirty-submit#{disabled_selector}", match: :first) - - expect(submit.disabled?).to be is_disabled + form.find("#{submit_selector}#{disabled_selector}") end selectors.each do |selector| it "disables #{selector[:form]} submit until there are changes on #{selector[:input]}", :js do form = find(selector[:form]) - submit = form.first('.js-dirty-submit') + submit_selector = selector[:submit] || 'input[type="submit"]' + submit = form.first(submit_selector) input = form.first(selector[:input]) is_radio = input[:type] == 'radio' is_checkbox = input[:type] == 'checkbox' @@ -22,15 +21,14 @@ shared_examples 'dirty submit form' do |selector_args| original_checkable = input if is_checkbox expect(submit.disabled?).to be true - expect(input.checked?).to be false is_checkable ? input.click : input.set("#{original_value} changes") - expect_disabled_state(form, submit, false) + expect_disabled_state(form, submit_selector, false) is_checkable ? original_checkable.click : input.set(original_value) - expect_disabled_state(form, submit) + expect_disabled_state(form, submit_selector) end end end |