BigW Consortium Gitlab

Remove duplicate ID

parent 5aa4d7bf
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
<input <input
type="text" type="text"
id="ipAddress" id="ipAddress"
class="form-control" class="form-control js-ip-address"
:placeholder="ingressExternalIp" :placeholder="ingressExternalIp"
readonly readonly
/> />
...@@ -194,8 +194,7 @@ ...@@ -194,8 +194,7 @@
<input <input
v-else v-else
type="text" type="text"
id="ipAddress" class="form-control js-ip-address"
class="form-control"
readonly readonly
placeholder="?" placeholder="?"
/> />
......
...@@ -99,13 +99,13 @@ feature 'Clusters Applications', :js do ...@@ -99,13 +99,13 @@ feature 'Clusters Applications', :js do
expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true') expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installed') expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installed')
expect(page).to have_selector('.js-no-ip-message') expect(page).to have_selector('.js-no-ip-message')
expect(page.find(:css, 'input#ipAddress')['placeholder']).to eq('?') expect(page.find(:css, 'input.js-ip-address')['placeholder']).to eq('?')
# We receive the external IP address and display # We receive the external IP address and display
Clusters::Cluster.last.application_ingress.update!(external_ip: '192.168.1.100') Clusters::Cluster.last.application_ingress.update!(external_ip: '192.168.1.100')
expect(page).not_to have_selector('.js-no-ip-message') expect(page).not_to have_selector('.js-no-ip-message')
expect(page.find(:css, 'input#ipAddress')['placeholder']).to eq('192.168.1.100') expect(page.find(:css, 'input.js-ip-address')['placeholder']).to eq('192.168.1.100')
end end
expect(page).to have_content('Ingress was successfully installed on your Kubernetes cluster') expect(page).to have_content('Ingress was successfully installed on your Kubernetes cluster')
......
...@@ -62,7 +62,7 @@ describe('Applications', () => { ...@@ -62,7 +62,7 @@ describe('Applications', () => {
}, },
}); });
expect( expect(
vm.$el.querySelector('#ipAddress').getAttribute('placeholder'), vm.$el.querySelector('.js-ip-address').getAttribute('placeholder'),
).toEqual('0.0.0.0'); ).toEqual('0.0.0.0');
expect( expect(
vm.$el.querySelector('.js-clipboard-btn').getAttribute('data-clipboard-text'), vm.$el.querySelector('.js-clipboard-btn').getAttribute('data-clipboard-text'),
...@@ -85,7 +85,7 @@ describe('Applications', () => { ...@@ -85,7 +85,7 @@ describe('Applications', () => {
}); });
expect( expect(
vm.$el.querySelector('#ipAddress').getAttribute('placeholder'), vm.$el.querySelector('.js-ip-address').getAttribute('placeholder'),
).toEqual('?'); ).toEqual('?');
expect( expect(
...@@ -109,7 +109,7 @@ describe('Applications', () => { ...@@ -109,7 +109,7 @@ describe('Applications', () => {
}); });
expect(vm.$el.textContent).not.toContain('Ingress IP Address'); expect(vm.$el.textContent).not.toContain('Ingress IP Address');
expect(vm.$el.querySelector('#ipAddress')).toBe(null); expect(vm.$el.querySelector('.js-ip-address')).toBe(null);
}); });
}); });
}); });
......
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