Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7d32f466
Commit
7d32f466
authored
Jun 05, 2019
by
Toon Claes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Attempt fix the failing specs
By specifying the file_type.
parent
d800bd28
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
17 deletions
+9
-17
ee/spec/controllers/admin/geo/uploads_controller_spec.rb
ee/spec/controllers/admin/geo/uploads_controller_spec.rb
+9
-17
No files found.
ee/spec/controllers/admin/geo/uploads_controller_spec.rb
View file @
7d32f466
...
...
@@ -7,7 +7,7 @@ describe Admin::Geo::UploadsController, :geo do
set
(
:admin
)
{
create
(
:admin
)
}
set
(
:secondary
)
{
create
(
:geo_node
)
}
set
(
:synced_registry
)
{
create
(
:geo_file_registry
,
:with_file
,
success:
true
)
}
set
(
:synced_registry
)
{
create
(
:geo_file_registry
,
:with_file
,
:attachment
,
success:
true
)
}
set
(
:failed_registry
)
{
create
(
:geo_file_registry
,
:failed
)
}
set
(
:never_registry
)
{
create
(
:geo_file_registry
,
:failed
,
retry_count:
nil
)
}
...
...
@@ -21,8 +21,7 @@ describe Admin::Geo::UploadsController, :geo do
shared_examples
'license required'
do
context
'without a valid license'
do
# Failure issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/11957
it
'redirects to license page with a flash message'
,
:quarantine
do
it
'redirects to license page with a flash message'
do
expect
(
subject
).
to
redirect_to
(
admin_license_path
)
expect
(
flash
[
:alert
]).
to
include
(
'You need a different license to use Geo replication'
)
end
...
...
@@ -42,15 +41,13 @@ describe Admin::Geo::UploadsController, :geo do
stub_current_geo_node
(
secondary
)
end
# Failure issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/11957
it
'renders the index template'
,
:quarantine
do
it
'renders the index template'
do
expect
(
subject
).
to
have_gitlab_http_status
(
200
)
expect
(
subject
).
to
render_template
(
:index
)
end
context
'without sync_status specified'
do
# Failure issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/11957
it
'renders all registries'
,
:quarantine
do
it
'renders all registries'
do
expect
(
subject
).
to
have_gitlab_http_status
(
200
)
expect
(
response
.
body
).
to
have_css
(
css_id
(
synced_registry
))
expect
(
response
.
body
).
to
have_css
(
css_id
(
failed_registry
))
...
...
@@ -61,8 +58,7 @@ describe Admin::Geo::UploadsController, :geo do
context
'with sync_status=synced'
do
subject
{
get
:index
,
params:
{
sync_status:
'synced'
}
}
# Failure issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/11957
it
'renders only synced registries'
,
:quarantine
do
it
'renders only synced registries'
do
expect
(
subject
).
to
have_gitlab_http_status
(
200
)
expect
(
response
.
body
).
to
have_css
(
css_id
(
synced_registry
))
expect
(
response
.
body
).
not_to
have_css
(
css_id
(
failed_registry
))
...
...
@@ -73,8 +69,7 @@ describe Admin::Geo::UploadsController, :geo do
context
'with sync_status=failed'
do
subject
{
get
:index
,
params:
{
sync_status:
'failed'
}
}
# Failure issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/11957
it
'renders only failed registries'
,
:quarantine
do
it
'renders only failed registries'
do
expect
(
subject
).
to
have_gitlab_http_status
(
200
)
expect
(
response
.
body
).
not_to
have_css
(
css_id
(
synced_registry
))
expect
(
response
.
body
).
to
have_css
(
css_id
(
failed_registry
))
...
...
@@ -85,8 +80,7 @@ describe Admin::Geo::UploadsController, :geo do
context
'with sync_status=never'
do
subject
{
get
:index
,
params:
{
sync_status:
'never'
}
}
# Failure issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/11957
it
'renders only never synced registries'
,
:quarantine
do
it
'renders only never synced registries'
do
expect
(
subject
).
to
have_gitlab_http_status
(
200
)
expect
(
response
.
body
).
not_to
have_css
(
css_id
(
synced_registry
))
expect
(
response
.
body
).
not_to
have_css
(
css_id
(
failed_registry
))
...
...
@@ -111,8 +105,7 @@ describe Admin::Geo::UploadsController, :geo do
context
'with an orphaned registry'
do
let
(
:upload_registry
)
{
create
(
:geo_file_registry
,
success:
true
)
}
# Failure issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/11957
it
'removes the registry'
,
:quarantine
do
it
'removes the registry'
do
upload_registry
.
update_column
(
:file_id
,
-
1
)
expect
(
subject
).
to
redirect_to
(
admin_geo_uploads_path
)
...
...
@@ -124,8 +117,7 @@ describe Admin::Geo::UploadsController, :geo do
context
'with a regular registry'
do
let
(
:upload_registry
)
{
create
(
:geo_file_registry
,
:avatar
,
:with_file
,
success:
true
)
}
# Failure issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/11957
it
'does not delete the registry and gives an error'
,
:quarantine
do
it
'does not delete the registry and gives an error'
do
expect
(
subject
).
to
redirect_to
(
admin_geo_uploads_path
)
expect
(
flash
[
:alert
]).
to
include
(
'Could not remove tracking entry'
)
expect
{
Geo
::
UploadRegistry
.
find
(
upload_registry
.
id
)
}.
not_to
raise_error
...
...
Write
Preview
Markdown
is supported
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