Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 10 deletions

diff --git a/qa/qa/page/project/issue/show.rb b/qa/qa/page/project/issue/show.rb
index 8f5632f7e6e..6ec80b7c9cc 100644
--- a/qa/qa/page/project/issue/show.rb
+++ b/qa/qa/page/project/issue/show.rb
@@ -108,6 +108,10 @@ module QA
             find_element(:more_assignees_link)
           end
 
+          def noteable_note_item
+            find_element(:noteable_note_item)
+          end
+
           def select_all_activities_filter
             select_filter_with_text('Show all activity')
           end
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
index 04ae4963d3a..300bf59eba4 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
@@ -21,8 +21,9 @@ module QA
       end
 
       context 'when using attachments in comments', :object_storage do
+        let(:gif_file_name) { 'banana_sample.gif' }
         let(:file_to_attach) do
-          File.absolute_path(File.join('spec', 'fixtures', 'banana_sample.gif'))
+          File.absolute_path(File.join('spec', 'fixtures', gif_file_name))
         end
 
         before do
@@ -37,15 +38,7 @@ module QA
           Page::Project::Issue::Show.perform do |show|
             show.comment('See attached banana for scale', attachment: file_to_attach)
 
-            show.refresh
-
-            image_url = find('a[href$="banana_sample.gif"]')[:href]
-
-            found = show.wait(reload: false) do
-              show.asset_exists?(image_url)
-            end
-
-            expect(found).to be_truthy
+            expect(show.noteable_note_item.find("img[src$='#{gif_file_name}']")).to be_visible
           end
         end
       end