Download as
Browse Code »

Commit cc54c66fd0e402743ce942c19040828e07d1da2f

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

Fix spec/requests/notes_on_merge_requests_spec.r

Showing 1 changed file with 3 additions and 4 deletions   Show diff stats
spec/requests/notes_on_merge_requests_spec.rb
  Diff comments   View file @cc54c66
@@ -116,8 +116,8 @@ describe "On a merge request diff", js: true, focus: true do @@ -116,8 +116,8 @@ describe "On a merge request diff", js: true, focus: true do
116 describe "the note form" do 116 describe "the note form" do
117 # set up hidden fields correctly 117 # set up hidden fields correctly
118 it { within(".js-temp-notes-holder") { find("#note_noteable_type").value.should == "MergeRequest" } } 118 it { within(".js-temp-notes-holder") { find("#note_noteable_type").value.should == "MergeRequest" } }
119 - it { within(".js-temp-notes-holder") { find("#note_noteable_id").value.should == "" } }  
120 - it { within(".js-temp-notes-holder") { find("#note_commit_id").value.should == "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a" } } 119 + it { within(".js-temp-notes-holder") { find("#note_noteable_id").value.should == merge_request.id.to_s } }
  120 + it { within(".js-temp-notes-holder") { find("#note_commit_id").value.should == "" } }
121 it { within(".js-temp-notes-holder") { find("#note_line_code").value.should == "4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185" } } 121 it { within(".js-temp-notes-holder") { find("#note_line_code").value.should == "4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185" } }
122 122
123 # buttons 123 # buttons
@@ -125,8 +125,7 @@ describe "On a merge request diff", js: true, focus: true do @@ -125,8 +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_unchecked_field("Project team") }  
129 - it { should have_checked_field("Commit author") } 128 + it { should have_checked_field("Project team") }
130 129
131 it "shouldn't add a second form for same row" do 130 it "shouldn't add a second form for same row" do
132 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")