Merge branch '44542-move-import-specific-attributes-out-of-the-project-model-ce-port' into 'master'

Resolve "Move `import_status` out of `projects`"

See merge request gitlab-org/gitlab-ce!18688

1 files changed, 4 insertions, 2 deletions

diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index c88510020c8..f3cf21cf279 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -1703,7 +1703,8 @@ describe Project do
 
       it 'resets project import_error' do
         error_message = 'Some error'
-        mirror = create(:project_empty_repo, :import_started, import_error: error_message)
+        mirror = create(:project_empty_repo, :import_started)
+        mirror.import_state.update_attributes(last_error: error_message)
 
         expect { mirror.import_finish }.to change { mirror.import_error }.from(error_message).to(nil)
       end
@@ -3347,7 +3348,8 @@ describe Project do
 
     context 'with an import JID' do
       it 'unsets the import JID' do
-        project = create(:project, import_jid: '123')
+        project = create(:project)
+        create(:import_state, project: project, jid: '123')
 
         expect(Gitlab::SidekiqStatus)
           .to receive(:unset)