Commit 7d32f466 authored by Toon Claes's avatar Toon Claes

Attempt fix the failing specs

By specifying the file_type.
parent d800bd28
...@@ -7,7 +7,7 @@ describe Admin::Geo::UploadsController, :geo do ...@@ -7,7 +7,7 @@ describe Admin::Geo::UploadsController, :geo do
set(:admin) { create(:admin) } set(:admin) { create(:admin) }
set(:secondary) { create(:geo_node) } 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(:failed_registry) { create(:geo_file_registry, :failed) }
set(:never_registry) { create(:geo_file_registry, :failed, retry_count: nil) } set(:never_registry) { create(:geo_file_registry, :failed, retry_count: nil) }
...@@ -21,8 +21,7 @@ describe Admin::Geo::UploadsController, :geo do ...@@ -21,8 +21,7 @@ describe Admin::Geo::UploadsController, :geo do
shared_examples 'license required' do shared_examples 'license required' do
context 'without a valid license' 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' do
it 'redirects to license page with a flash message', :quarantine do
expect(subject).to redirect_to(admin_license_path) expect(subject).to redirect_to(admin_license_path)
expect(flash[:alert]).to include('You need a different license to use Geo replication') expect(flash[:alert]).to include('You need a different license to use Geo replication')
end end
...@@ -42,15 +41,13 @@ describe Admin::Geo::UploadsController, :geo do ...@@ -42,15 +41,13 @@ describe Admin::Geo::UploadsController, :geo do
stub_current_geo_node(secondary) stub_current_geo_node(secondary)
end end
# Failure issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/11957 it 'renders the index template' do
it 'renders the index template', :quarantine do
expect(subject).to have_gitlab_http_status(200) expect(subject).to have_gitlab_http_status(200)
expect(subject).to render_template(:index) expect(subject).to render_template(:index)
end end
context 'without sync_status specified' do context 'without sync_status specified' do
# Failure issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/11957 it 'renders all registries' do
it 'renders all registries', :quarantine do
expect(subject).to have_gitlab_http_status(200) 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(synced_registry))
expect(response.body).to have_css(css_id(failed_registry)) expect(response.body).to have_css(css_id(failed_registry))
...@@ -61,8 +58,7 @@ describe Admin::Geo::UploadsController, :geo do ...@@ -61,8 +58,7 @@ describe Admin::Geo::UploadsController, :geo do
context 'with sync_status=synced' do context 'with sync_status=synced' do
subject { get :index, params: { sync_status: 'synced' } } subject { get :index, params: { sync_status: 'synced' } }
# Failure issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/11957 it 'renders only synced registries' do
it 'renders only synced registries', :quarantine do
expect(subject).to have_gitlab_http_status(200) 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(synced_registry))
expect(response.body).not_to have_css(css_id(failed_registry)) expect(response.body).not_to have_css(css_id(failed_registry))
...@@ -73,8 +69,7 @@ describe Admin::Geo::UploadsController, :geo do ...@@ -73,8 +69,7 @@ describe Admin::Geo::UploadsController, :geo do
context 'with sync_status=failed' do context 'with sync_status=failed' do
subject { get :index, params: { sync_status: 'failed' } } subject { get :index, params: { sync_status: 'failed' } }
# Failure issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/11957 it 'renders only failed registries' do
it 'renders only failed registries', :quarantine do
expect(subject).to have_gitlab_http_status(200) 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(synced_registry))
expect(response.body).to have_css(css_id(failed_registry)) expect(response.body).to have_css(css_id(failed_registry))
...@@ -85,8 +80,7 @@ describe Admin::Geo::UploadsController, :geo do ...@@ -85,8 +80,7 @@ describe Admin::Geo::UploadsController, :geo do
context 'with sync_status=never' do context 'with sync_status=never' do
subject { get :index, params: { sync_status: 'never' } } subject { get :index, params: { sync_status: 'never' } }
# Failure issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/11957 it 'renders only never synced registries' do
it 'renders only never synced registries', :quarantine do
expect(subject).to have_gitlab_http_status(200) 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(synced_registry))
expect(response.body).not_to have_css(css_id(failed_registry)) expect(response.body).not_to have_css(css_id(failed_registry))
...@@ -111,8 +105,7 @@ describe Admin::Geo::UploadsController, :geo do ...@@ -111,8 +105,7 @@ describe Admin::Geo::UploadsController, :geo do
context 'with an orphaned registry' do context 'with an orphaned registry' do
let(:upload_registry) { create(:geo_file_registry, success: true) } let(:upload_registry) { create(:geo_file_registry, success: true) }
# Failure issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/11957 it 'removes the registry' do
it 'removes the registry', :quarantine do
upload_registry.update_column(:file_id, -1) upload_registry.update_column(:file_id, -1)
expect(subject).to redirect_to(admin_geo_uploads_path) expect(subject).to redirect_to(admin_geo_uploads_path)
...@@ -124,8 +117,7 @@ describe Admin::Geo::UploadsController, :geo do ...@@ -124,8 +117,7 @@ describe Admin::Geo::UploadsController, :geo do
context 'with a regular registry' do context 'with a regular registry' do
let(:upload_registry) { create(:geo_file_registry, :avatar, :with_file, success: true) } 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' do
it 'does not delete the registry and gives an error', :quarantine do
expect(subject).to redirect_to(admin_geo_uploads_path) expect(subject).to redirect_to(admin_geo_uploads_path)
expect(flash[:alert]).to include('Could not remove tracking entry') expect(flash[:alert]).to include('Could not remove tracking entry')
expect { Geo::UploadRegistry.find(upload_registry.id) }.not_to raise_error expect { Geo::UploadRegistry.find(upload_registry.id) }.not_to raise_error
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment