diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-06-07 12:24:51 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-06-07 12:24:51 +0300 |
commit | a9155ab05eb68fdf5d6967d268d8be8de7af6ab8 (patch) | |
tree | 68a094fec4553cf84ca820767566a6248a926786 | |
parent | 7c374f52c6428d2f0566ae062e67ec98420b94fd (diff) | |
parent | 3ed66d4abde28c9f586342fe8e6481360825b823 (diff) |
Merge branch '47208-human-import-status-name-not-working' into 'master'
Resolve "ActionView::Template::Error: undefined method `human_import_status_name"
Closes #47208
See merge request gitlab-org/gitlab-ce!19470
-rw-r--r-- | app/models/project.rb | 6 | ||||
-rw-r--r-- | changelogs/unreleased/47208-human-import-status-name-not-working.yml | 5 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 25 |
3 files changed, 36 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 562198e2369..60cd13b371f 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -675,6 +675,12 @@ class Project < ActiveRecord::Base end end + def human_import_status_name + ensure_import_state + + import_state.human_status_name + end + def import_schedule ensure_import_state(force: true) diff --git a/changelogs/unreleased/47208-human-import-status-name-not-working.yml b/changelogs/unreleased/47208-human-import-status-name-not-working.yml new file mode 100644 index 00000000000..e1f603f988e --- /dev/null +++ b/changelogs/unreleased/47208-human-import-status-name-not-working.yml @@ -0,0 +1,5 @@ +--- +title: Showing project import_status in a humanized form no longer gives an error +merge_request: 19470 +author: +type: fixed diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index fe9d64c0e3b..52fc7423c26 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -1693,6 +1693,31 @@ describe Project do end end + describe '#human_import_status_name' do + context 'when import_state exists' do + it 'returns the humanized status name' do + project = create(:project) + create(:import_state, :started, project: project) + + expect(project.human_import_status_name).to eq("started") + end + end + + context 'when import_state was not created yet' do + let(:project) { create(:project, :import_started) } + + it 'ensures import_state is created and returns humanized status name' do + expect do + project.human_import_status_name + end.to change { ProjectImportState.count }.from(0).to(1) + end + + it 'returns humanized status name' do + expect(project.human_import_status_name).to eq("started") + end + end + end + describe 'Project import job' do let(:project) { create(:project, import_url: generate(:url)) } |