Download as
Browse Code »

Commit dfe2a742c2f2b862109a757cf90495ea1fcde70c

Authored by Dmitriy Zaporozhets
1 parent fd1b9fdc
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

fix notes specs

Showing 2 changed files with 7 additions and 7 deletions   Show diff stats
spec/requests/notes_on_merge_requests_spec.rb
  Diff comments   View file @dfe2a74
@@ -22,9 +22,9 @@ describe "On a merge request", js: true do @@ -22,9 +22,9 @@ describe "On a merge request", js: true do
22 it { within(".js-main-target-form") { should_not have_link("Cancel") } } 22 it { within(".js-main-target-form") { should_not have_link("Cancel") } }
23 23
24 # notifiactions 24 # notifiactions
25 - it { within(".js-main-target-form") { should have_checked_field("Project team") } }  
26 - it { within(".js-main-target-form") { should_not have_checked_field("Commit author") } }  
27 - it { within(".js-main-target-form") { should_not have_unchecked_field("Commit author") } } 25 + it { within(".js-main-target-form") { should have_checked_field("Notify team via email") } }
  26 + it { within(".js-main-target-form") { should_not have_checked_field("Notify commit author") } }
  27 + it { within(".js-main-target-form") { should_not have_unchecked_field("Notify commit author") } }
28 28
29 describe "without text" do 29 describe "without text" do
30 it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } } 30 it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }
@@ -125,7 +125,7 @@ describe "On a merge request diff", js: true, focus: true do @@ -125,7 +125,7 @@ describe "On a merge request diff", js: true, focus: true do
125 it { should have_css(".js-close-discussion-note-form", text: "Cancel") } 125 it { should have_css(".js-close-discussion-note-form", text: "Cancel") }
126 126
127 # notification options 127 # notification options
128 - it { should have_checked_field("Project team") } 128 + it { should have_checked_field("Notify team via email") }
129 129
130 it "shouldn't add a second form for same row" do 130 it "shouldn't add a second form for same row" do
131 find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder .js-add-diff-note-button").trigger("click") 131 find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder .js-add-diff-note-button").trigger("click")
spec/requests/notes_on_wall_spec.rb
  Diff comments   View file @dfe2a74
@@ -21,9 +21,9 @@ describe "On the project wall", js: true do @@ -21,9 +21,9 @@ describe "On the project wall", js: true do
21 it { within(".js-main-target-form") { should_not have_link("Cancel") } } 21 it { within(".js-main-target-form") { should_not have_link("Cancel") } }
22 22
23 # notifiactions 23 # notifiactions
24 - it { within(".js-main-target-form") { should have_checked_field("Project team") } }  
25 - it { within(".js-main-target-form") { should_not have_checked_field("Commit author") } }  
26 - it { within(".js-main-target-form") { should_not have_unchecked_field("Commit author") } } 24 + it { within(".js-main-target-form") { should have_checked_field("Notify team via email") } }
  25 + it { within(".js-main-target-form") { should_not have_checked_field("Notify commit author") } }
  26 + it { within(".js-main-target-form") { should_not have_unchecked_field("Notify commit author") } }
27 27
28 describe "without text" do 28 describe "without text" do
29 it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } } 29 it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }