diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-02-20 16:50:14 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-02-20 16:50:14 +0000 |
| commit | e1d587f5d6fe76900dd7cce26178464d4455fb8b (patch) | |
| tree | 52e7748c448ba34bd4eb8ed62835e22679125014 | |
| parent | 5aa4d7bfb4a3ffa7881bdba0a0dcc50cdb245684 (diff) | |
| download | gitlab-ce-e1d587f5d6fe76900dd7cce26178464d4455fb8b.tar.gz | |
Remove duplicate ID
3 files changed, 7 insertions, 8 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index 6490cd6ff47..bddc8756a1b 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -179,7 +179,7 @@ <input type="text" id="ipAddress" - class="form-control" + class="form-control js-ip-address" :placeholder="ingressExternalIp" readonly /> @@ -194,8 +194,7 @@ <input v-else type="text" - id="ipAddress" - class="form-control" + class="form-control js-ip-address" readonly placeholder="?" /> diff --git a/spec/features/projects/clusters/applications_spec.rb b/spec/features/projects/clusters/applications_spec.rb index b984bdb5803..fd322d2eeb4 100644 --- a/spec/features/projects/clusters/applications_spec.rb +++ b/spec/features/projects/clusters/applications_spec.rb @@ -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')).to have_content('Installed') 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 Clusters::Cluster.last.application_ingress.update!(external_ip: '192.168.1.100') 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 expect(page).to have_content('Ingress was successfully installed on your Kubernetes cluster') diff --git a/spec/javascripts/clusters/components/applications_spec.js b/spec/javascripts/clusters/components/applications_spec.js index 9bd47aea7f9..e3312f62c04 100644 --- a/spec/javascripts/clusters/components/applications_spec.js +++ b/spec/javascripts/clusters/components/applications_spec.js @@ -62,7 +62,7 @@ describe('Applications', () => { }, }); expect( - vm.$el.querySelector('#ipAddress').getAttribute('placeholder'), + vm.$el.querySelector('.js-ip-address').getAttribute('placeholder'), ).toEqual('0.0.0.0'); expect( vm.$el.querySelector('.js-clipboard-btn').getAttribute('data-clipboard-text'), @@ -85,7 +85,7 @@ describe('Applications', () => { }); expect( - vm.$el.querySelector('#ipAddress').getAttribute('placeholder'), + vm.$el.querySelector('.js-ip-address').getAttribute('placeholder'), ).toEqual('?'); expect( @@ -109,7 +109,7 @@ describe('Applications', () => { }); 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); }); }); }); |