Commit a2c11428 authored by Ezekiel Kigbo's avatar Ezekiel Kigbo

Merge branch 'rename-cluster-form-class' into 'master'

Rename class that is too similar to js-cluster-integrations-form

See merge request gitlab-org/gitlab!57928
parents e03a3537 246e0658
...@@ -3,7 +3,7 @@ import IntegrationForm from '../components/integration_form.vue'; ...@@ -3,7 +3,7 @@ import IntegrationForm from '../components/integration_form.vue';
import { createStore } from '../stores'; import { createStore } from '../stores';
export default () => { export default () => {
const entryPoint = document.querySelector('#js-cluster-integration-form'); const entryPoint = document.querySelector('#js-cluster-details-form');
if (!entryPoint) { if (!entryPoint) {
return; return;
......
= form_for @cluster, url: clusterable.cluster_path(@cluster), as: :cluster, html: { class: 'js-cluster-integration-form' } do |field| = form_for @cluster, url: clusterable.cluster_path(@cluster), as: :cluster, html: { class: 'js-cluster-details-form' } do |field|
= form_errors(@cluster) = form_errors(@cluster)
#js-cluster-integration-form{ data: js_cluster_form_data(@cluster, can?(current_user, :update_cluster, @cluster)) } #js-cluster-details-form{ data: js_cluster_form_data(@cluster, can?(current_user, :update_cluster, @cluster)) }
...@@ -23,7 +23,7 @@ RSpec.describe 'Clusterable > Show page' do ...@@ -23,7 +23,7 @@ RSpec.describe 'Clusterable > Show page' do
it 'allow the user to set domain', :js do it 'allow the user to set domain', :js do
visit cluster_path visit cluster_path
within '.js-cluster-integration-form' do within '.js-cluster-details-form' do
fill_in('cluster_base_domain', with: 'test.com') fill_in('cluster_base_domain', with: 'test.com')
click_on 'Save changes' click_on 'Save changes'
end end
...@@ -39,7 +39,7 @@ RSpec.describe 'Clusterable > Show page' do ...@@ -39,7 +39,7 @@ RSpec.describe 'Clusterable > Show page' do
end end
it 'shows help text with the domain as an alternative to custom domain', :js do it 'shows help text with the domain as an alternative to custom domain', :js do
within '.js-cluster-integration-form' do within '.js-cluster-details-form' do
expect(find(cluster_ingress_help_text_selector).text).to include('192.168.1.100') expect(find(cluster_ingress_help_text_selector).text).to include('192.168.1.100')
end end
end end
...@@ -49,7 +49,7 @@ RSpec.describe 'Clusterable > Show page' do ...@@ -49,7 +49,7 @@ RSpec.describe 'Clusterable > Show page' do
it 'alternative to custom domain is not shown' do it 'alternative to custom domain is not shown' do
visit cluster_path visit cluster_path
within '.js-cluster-integration-form' do within '.js-cluster-details-form' do
expect(page).not_to have_selector(cluster_ingress_help_text_selector) expect(page).not_to have_selector(cluster_ingress_help_text_selector)
end end
end end
......
...@@ -97,7 +97,7 @@ RSpec.describe 'User Cluster', :js do ...@@ -97,7 +97,7 @@ RSpec.describe 'User Cluster', :js do
context 'when user disables the cluster' do context 'when user disables the cluster' do
before do before do
page.find(:css, '.js-cluster-enable-toggle-area .js-project-feature-toggle').click page.find(:css, '.js-cluster-enable-toggle-area .js-project-feature-toggle').click
page.within('.js-cluster-integration-form') { click_button 'Save changes' } page.within('.js-cluster-details-form') { click_button 'Save changes' }
end end
it 'user sees the successful message' do it 'user sees the successful message' do
......
...@@ -119,7 +119,7 @@ RSpec.describe 'Gcp Cluster', :js do ...@@ -119,7 +119,7 @@ RSpec.describe 'Gcp Cluster', :js do
context 'when user disables the cluster' do context 'when user disables the cluster' do
before do before do
page.find(:css, '.js-cluster-enable-toggle-area .js-project-feature-toggle').click page.find(:css, '.js-cluster-enable-toggle-area .js-project-feature-toggle').click
page.within('.js-cluster-integration-form') { click_button 'Save changes' } page.within('.js-cluster-details-form') { click_button 'Save changes' }
end end
it 'user sees the successful message' do it 'user sees the successful message' do
......
...@@ -84,7 +84,7 @@ RSpec.describe 'User Cluster', :js do ...@@ -84,7 +84,7 @@ RSpec.describe 'User Cluster', :js do
context 'when user disables the cluster' do context 'when user disables the cluster' do
before do before do
page.find(:css, '.js-cluster-enable-toggle-area .js-project-feature-toggle').click page.find(:css, '.js-cluster-enable-toggle-area .js-project-feature-toggle').click
page.within('.js-cluster-integration-form') { click_button 'Save changes' } page.within('.js-cluster-details-form') { click_button 'Save changes' }
end end
it 'user sees the successful message' do it 'user sees the successful message' do
......
...@@ -58,7 +58,7 @@ RSpec.describe 'Clusters', :js do ...@@ -58,7 +58,7 @@ RSpec.describe 'Clusters', :js do
before do before do
click_link 'default-cluster' click_link 'default-cluster'
fill_in 'cluster_environment_scope', with: 'production/*' fill_in 'cluster_environment_scope', with: 'production/*'
within '.js-cluster-integration-form' do within '.js-cluster-details-form' do
click_button 'Save changes' click_button 'Save changes'
end end
end end
...@@ -149,7 +149,7 @@ RSpec.describe 'Clusters', :js do ...@@ -149,7 +149,7 @@ RSpec.describe 'Clusters', :js do
before do before do
click_link 'default-cluster' click_link 'default-cluster'
fill_in 'cluster_environment_scope', with: 'production/*' fill_in 'cluster_environment_scope', with: 'production/*'
within ".js-cluster-integration-form" do within ".js-cluster-details-form" do
click_button 'Save changes' click_button 'Save changes'
end end
end end
......
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