Fix merge request closed filter. Fixed one more test

1 files changed, 3 insertions, 1 deletions

diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index 06e18195df5..059e65f8cee 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -136,7 +136,9 @@ describe "On a merge request diff", js: true, focus: true do
       end
 
       it "should be removed when canceled" do
-        first(".js-close-discussion-note-form").trigger("click")
+        within(".file form[rel$='4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185']") do
+          find(".js-close-discussion-note-form").trigger("click")
+        end
 
         should have_no_css(".js-temp-notes-holder")
       end