Automatic merge of gitlab-org/gitlab-ce master

qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb

@@ -3,7 +3,7 @@
 module QA
   context 'Plan' do
     describe 'Issue comments' do
-      it 'user comments on an issue and edits the comment' do
+      before do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
         Page::Main::Login.perform(&:sign_in_using_credentials)
 
@@ -11,7 +11,9 @@ module QA
           issue.title = 'issue title'
         end
         issue.visit!
+      end
 
+      it 'user comments on an issue and edits the comment' do
         Page::Project::Issue::Show.perform do |issue_show_page|
           first_version_of_comment = 'First version of the comment'
           second_version_of_comment = 'Second version of the comment'

qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb

@@ -5,7 +5,7 @@ module QA
     describe 'filter issue comments activities' do
       let(:issue_title) { 'issue title' }
 
-      it 'user filters comments and activities in an issue' do
+      before do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
         Page::Main::Login.perform(&:sign_in_using_credentials)
 
@@ -14,9 +14,9 @@ module QA
         end
 
         issue.visit!
+      end
 
-        expect(page).to have_content(issue_title)
-
+      it 'user filters comments and activities in an issue' do
         Page::Project::Issue::Show.perform do |show_page|
           my_own_comment = "My own comment"
           made_the_issue_confidential = "made the issue confidential"