Commit bcea20f8 authored by Thong Kuah's avatar Thong Kuah

Merge branch 'ui-text-review-adv-search' into 'master'

Review Adv Search admin UI text

See merge request gitlab-org/gitlab!73269
parents c9eb99bd 998c396d
...@@ -115,7 +115,7 @@ RSpec.describe 'Admin updates EE-only settings' do ...@@ -115,7 +115,7 @@ RSpec.describe 'Admin updates EE-only settings' do
expect(page).not_to have_content('Namespaces to index') expect(page).not_to have_content('Namespaces to index')
expect(page).not_to have_content('Projects to index') expect(page).not_to have_content('Projects to index')
check 'Limit namespaces and projects that can be indexed' check 'Limit the number of namespaces and projects that can be indexed.'
expect(page).to have_content('Namespaces to index') expect(page).to have_content('Namespaces to index')
expect(page).to have_content('Projects to index') expect(page).to have_content('Projects to index')
......
...@@ -237,11 +237,11 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do ...@@ -237,11 +237,11 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do
it 'does not show the retry migration card' do it 'does not show the retry migration card' do
render render
expect(rendered).not_to include('There is a halted Elasticsearch migration') expect(rendered).not_to include('Elasticsearch migration halted')
expect(rendered).not_to include('Retry migration') expect(rendered).not_to include('Retry migration')
end end
context 'when there is a halted migration' do context 'when Elasticsearch migration halted' do
let(:migration) { Elastic::DataMigrationService.migrations.last } let(:migration) { Elastic::DataMigrationService.migrations.last }
before do before do
...@@ -253,7 +253,7 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do ...@@ -253,7 +253,7 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do
it 'shows the retry migration card' do it 'shows the retry migration card' do
render render
expect(rendered).to include('There is a halted Elasticsearch migration') expect(rendered).to include('Elasticsearch migration halted')
expect(rendered).to have_css('a', text: 'Retry migration') expect(rendered).to have_css('a', text: 'Retry migration')
expect(rendered).not_to have_css('a[disabled="disabled"]', text: 'Retry migration') expect(rendered).not_to have_css('a[disabled="disabled"]', text: 'Retry migration')
end end
...@@ -267,7 +267,7 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do ...@@ -267,7 +267,7 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do
it 'shows the retry migration card with retry button disabled' do it 'shows the retry migration card with retry button disabled' do
render render
expect(rendered).to include('There is a halted Elasticsearch migration') expect(rendered).to include('Elasticsearch migration halted')
expect(rendered).to have_css('a[disabled="disabled"]', text: 'Retry migration') expect(rendered).to have_css('a[disabled="disabled"]', text: 'Retry migration')
end end
end end
...@@ -281,7 +281,7 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do ...@@ -281,7 +281,7 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do
it 'does not show the retry migration card' do it 'does not show the retry migration card' do
render render
expect(rendered).not_to include('There is a halted Elasticsearch migration') expect(rendered).not_to include('Elasticsearch migration halted')
expect(rendered).not_to include('Retry migration') expect(rendered).not_to include('Retry migration')
end end
end end
......
This diff is collapsed.
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