diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-02-20 12:44:20 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-02-20 13:07:43 +0000 |
| commit | 3619c9174558bd2b2ae625ac6db480c437eb8484 (patch) | |
| tree | 7040e779b522a9656b36abf4b8372378f5f5f63b /spec | |
| parent | 7efb28515f4d25120638a7025ebb26afc6114975 (diff) | |
| download | gitlab-ce-3619c9174558bd2b2ae625ac6db480c437eb8484.tar.gz | |
Adds missing links, uses value instead of placeholder in input field and properly sets the ip key
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/javascripts/clusters/components/applications_spec.js | 5 | ||||
| -rw-r--r-- | spec/javascripts/clusters/services/mock_data.js | 1 | ||||
| -rw-r--r-- | spec/javascripts/clusters/stores/clusters_store_spec.js | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/spec/javascripts/clusters/components/applications_spec.js b/spec/javascripts/clusters/components/applications_spec.js index d055679aea8..9bd47aea7f9 100644 --- a/spec/javascripts/clusters/components/applications_spec.js +++ b/spec/javascripts/clusters/components/applications_spec.js @@ -54,14 +54,13 @@ describe('Applications', () => { ingress: { title: 'Ingress', status: 'installed', - external_ip: '0.0.0.0', + externalIp: '0.0.0.0', }, helm: { title: 'Helm Tiller' }, runner: { title: 'GitLab Runner' }, prometheus: { title: 'Prometheus' }, }, }); - expect( vm.$el.querySelector('#ipAddress').getAttribute('placeholder'), ).toEqual('0.0.0.0'); @@ -92,7 +91,7 @@ describe('Applications', () => { expect( vm.$el.querySelector('.js-no-ip-message').textContent.replace(/\n(\s)+/g, ' ').trim(), ).toEqual( - 'The IP address is in process to be assigned, please check your Kubernetes cluster or Quotas on GKE if it takes a long time. More information', + 'The IP address is still in the process of being assigned, please check your Kubernetes cluster or Quotas on GKE if it takes a long time. More information', ); }); }); diff --git a/spec/javascripts/clusters/services/mock_data.js b/spec/javascripts/clusters/services/mock_data.js index 253b3c45243..6ae7a792329 100644 --- a/spec/javascripts/clusters/services/mock_data.js +++ b/spec/javascripts/clusters/services/mock_data.js @@ -18,6 +18,7 @@ const CLUSTERS_MOCK_DATA = { name: 'ingress', status: APPLICATION_ERROR, status_reason: 'Cannot connect', + external_ip: null, }, { name: 'runner', status: APPLICATION_INSTALLING, diff --git a/spec/javascripts/clusters/stores/clusters_store_spec.js b/spec/javascripts/clusters/stores/clusters_store_spec.js index 726a4ed30de..8028faf2f02 100644 --- a/spec/javascripts/clusters/stores/clusters_store_spec.js +++ b/spec/javascripts/clusters/stores/clusters_store_spec.js @@ -75,6 +75,7 @@ describe('Clusters Store', () => { statusReason: mockResponseData.applications[1].status_reason, requestStatus: null, requestReason: null, + externalIp: null, }, runner: { title: 'GitLab Runner', |