Add latest changes from gitlab-org/gitlab@master

3 files changed, 11 insertions, 15 deletions

diff --git a/qa/qa/resource/project.rb b/qa/qa/resource/project.rb
index 53104a51398..09763ab8990 100644
--- a/qa/qa/resource/project.rb
+++ b/qa/qa/resource/project.rb
@@ -13,8 +13,7 @@ module QA
                     :github_personal_access_token,
                     :github_repository_path,
                     :gitlab_repository_path,
-                    :personal_namespace,
-                    :description
+                    :personal_namespace
 
       attr_reader :repository_storage
 
@@ -27,7 +26,8 @@ module QA
                  :template_name,
                  :import,
                  :import_status,
-                 :import_error
+                 :import_error,
+                 :description
 
       attribute :group do
         Group.fabricate! do |group|
@@ -459,10 +459,12 @@ module QA
 
         response = post(request_url(api_housekeeping_path), nil)
 
-        unless response.code == HTTP_STATUS_CREATED
-          raise ResourceQueryError,
-            "Could not perform housekeeping. Request returned (#{response.code}): `#{response.body}`."
-        end
+        return if response.code == HTTP_STATUS_CREATED
+
+        raise(
+          ResourceQueryError,
+          "Could not perform housekeeping. Request returned (#{response.code}): `#{response.body}`."
+        )
       end
 
       # Gets project statistics.
diff --git a/qa/qa/specs/features/api/1_manage/import_github_repo_spec.rb b/qa/qa/specs/features/api/1_manage/import_github_repo_spec.rb
index 79509bdbe01..df34bf32421 100644
--- a/qa/qa/specs/features/api/1_manage/import_github_repo_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/import_github_repo_spec.rb
@@ -65,10 +65,8 @@ module QA
       end
 
       def verify_repository_import
-        expect(imported_project.api_response).to include(
-          description: 'Project for github import test',
-          import_error: nil
-        )
+        expect(imported_project.reload!.description).to eq('Project for github import test')
+        expect(imported_project.api_response[:import_error]).to be_nil
       end
 
       def verify_commits_import
diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb
index 2d4ec6d5f72..d07fff80b19 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb
@@ -44,10 +44,6 @@ module QA
 
         it_behaves_like 'successful project creation'
       end
-
-      after do
-        project.remove_via_api!
-      end
     end
   end
 end