Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
5e0a3bc808fd
Commit
5e0a3bc8
authored
Jun 05, 2018
by
Tiago Botelho
Browse files
Adds #human_import_status_name to make it comply with ProjectImportState#human_status_name
parent
1de3d5d88507
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/models/project.rb
View file @
5e0a3bc8
...
...
@@ -674,6 +674,12 @@
end
end
def
human_import_status_name
ensure_import_state
import_state
.
human_status_name
end
def
import_schedule
ensure_import_state
(
force:
true
)
...
...
changelogs/unreleased/47208-human-import-status-name-not-working.yml
0 → 100644
View file @
5e0a3bc8
---
title
:
Showing project import_status in a humanized form no longer gives an error
merge_request
:
19470
author
:
type
:
fixed
spec/models/project_spec.rb
View file @
5e0a3bc8
...
...
@@ -1693,6 +1693,31 @@
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
))
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment