From 848f49801d2c45227c525fb5ecdf8b71e7711ded Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Mon, 12 Feb 2018 12:40:55 +0100
Subject: [PATCH] add entity and update spec

---
 lib/api/api.rb                           | 1 +
 lib/api/entities.rb                      | 5 +++++
 spec/requests/api/project_import_spec.rb | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/api/api.rb b/lib/api/api.rb
index e953f3d2eca..754549f72f0 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -138,6 +138,7 @@ module API
     mount ::API::PagesDomains
     mount ::API::Pipelines
     mount ::API::PipelineSchedules
+    mount ::API::ProjectImport
     mount ::API::ProjectHooks
     mount ::API::Projects
     mount ::API::ProjectMilestones
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 7838de13c56..8fbad2b6959 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -90,6 +90,11 @@ module API
       expose :created_at
     end
 
+    class ProjectImportStatus < ProjectIdentity
+      expose :import_status
+      expose :import_error, if: :import_error
+    end
+
     class BasicProjectDetails < ProjectIdentity
       include ::API::ProjectsRelationBuilder
 
diff --git a/spec/requests/api/project_import_spec.rb b/spec/requests/api/project_import_spec.rb
index bf7bde0325a..55df2d34419 100644
--- a/spec/requests/api/project_import_spec.rb
+++ b/spec/requests/api/project_import_spec.rb
@@ -33,7 +33,7 @@ describe API::ProjectImport do
       get api("/projects/#{project.id}/import", user)
 
       expect(response).to have_gitlab_http_status(200)
-      expect(json_response).to eq('import_status' => 'started')
+      expect(json_response).to include('import_status' => 'started')
     end
 
     it 'returns the import status and the error if failed' do
@@ -42,7 +42,7 @@ describe API::ProjectImport do
       get api("/projects/#{project.id}/import", user)
 
       expect(response).to have_gitlab_http_status(200)
-      expect(json_response).to eq('import_status' => 'failed',
+      expect(json_response).to include('import_status' => 'failed',
                                   'import_error' => 'error')
     end
   end