Add latest changes from gitlab-org/gitlab@master

2 files changed, 16 insertions, 10 deletions

diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb
index b2eef38f896..5459104ec84 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb
@@ -4,9 +4,6 @@ module QA
   context 'Create' do
     describe 'Commit data' do
       before(:context) do
-        Runtime::Browser.visit(:gitlab, Page::Main::Login)
-        Page::Main::Login.perform(&:sign_in_using_credentials)
-
         # Get the user's details to confirm they're included in the email patch
         @user = Resource::User.fabricate_via_api! do |user|
           user.username = Runtime::User.username
@@ -34,9 +31,12 @@ module QA
       end
 
       def view_commit
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.perform(&:sign_in_using_credentials)
+
         @project.visit!
-        Page::Project::Show.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
-          page.click_commit(@commit_message)
+        Page::Project::Show.perform do |show|
+          show.click_commit(@commit_message)
         end
       end
 
diff --git a/qa/qa/support/api.rb b/qa/qa/support/api.rb
index d0ff1f8bc2c..cd496efb4db 100644
--- a/qa/qa/support/api.rb
+++ b/qa/qa/support/api.rb
@@ -14,7 +14,7 @@ module QA
           payload: payload,
           verify_ssl: false)
       rescue RestClient::ExceptionWithResponse => e
-        e.response
+        return_response_or_raise(e)
       end
 
       def get(url, raw_response: false)
@@ -24,7 +24,7 @@ module QA
           verify_ssl: false,
           raw_response: raw_response)
       rescue RestClient::ExceptionWithResponse => e
-        e.response
+        return_response_or_raise(e)
       end
 
       def put(url, payload)
@@ -34,7 +34,7 @@ module QA
           payload: payload,
           verify_ssl: false)
       rescue RestClient::ExceptionWithResponse => e
-        e.response
+        return_response_or_raise(e)
       end
 
       def delete(url)
@@ -43,7 +43,7 @@ module QA
           url: url,
           verify_ssl: false)
       rescue RestClient::ExceptionWithResponse => e
-        e.response
+        return_response_or_raise(e)
       end
 
       def head(url)
@@ -52,12 +52,18 @@ module QA
           url: url,
           verify_ssl: false)
       rescue RestClient::ExceptionWithResponse => e
-        e.response
+        return_response_or_raise(e)
       end
 
       def parse_body(response)
         JSON.parse(response.body, symbolize_names: true)
       end
+
+      def return_response_or_raise(error)
+        raise error unless error.respond_to?(:response) && error.response
+
+        error.response
+      end
     end
   end
 end