diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-07 13:53:35 +0100 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-07 13:53:35 +0100 |
commit | a906752d7f585c3122f47404e3f80f098e5bf223 (patch) | |
tree | 05f2ad02b8b4c55cb6d660d54476feacfcfd41d0 /spec/javascripts/clusters | |
parent | fd9be1dd1f077a33e5ab15e8273fb726cbbc6fcc (diff) | |
parent | 67e12219bf6257568f91c1a9c883e4821337c80d (diff) | |
download | gitlab-ce-a906752d7f585c3122f47404e3f80f098e5bf223.tar.gz |
Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applications
Diffstat (limited to 'spec/javascripts/clusters')
-rw-r--r-- | spec/javascripts/clusters/clusters_bundle_spec.js | 30 | ||||
-rw-r--r-- | spec/javascripts/clusters/components/application_row_spec.js | 4 |
2 files changed, 7 insertions, 27 deletions
diff --git a/spec/javascripts/clusters/clusters_bundle_spec.js b/spec/javascripts/clusters/clusters_bundle_spec.js index 86e9cb22be8..027e8001053 100644 --- a/spec/javascripts/clusters/clusters_bundle_spec.js +++ b/spec/javascripts/clusters/clusters_bundle_spec.js @@ -49,7 +49,7 @@ describe('Clusters', () => { helm: { status: APPLICATION_INSTALLABLE, title: 'Helm Tiller' }, }); - expect(document.querySelector('.js-cluster-application-notice.hidden')).toBeDefined(); + expect(document.querySelector('.js-cluster-application-notice .flash-text')).toBeNull(); }); it('shows an alert when something gets newly installed', () => { @@ -61,8 +61,8 @@ describe('Clusters', () => { helm: { status: APPLICATION_INSTALLED, title: 'Helm Tiller' }, }); - expect(document.querySelector('.js-cluster-application-notice:not(.hidden)')).toBeDefined(); - expect(document.querySelector('.js-cluster-application-notice').textContent.trim()).toEqual('Helm Tiller was successfully installed on your cluster'); + expect(document.querySelector('.js-cluster-application-notice .flash-text')).toBeDefined(); + expect(document.querySelector('.js-cluster-application-notice .flash-text').textContent.trim()).toEqual('Helm Tiller was successfully installed on your cluster'); }); it('shows an alert when multiple things gets newly installed', () => { @@ -76,28 +76,8 @@ describe('Clusters', () => { ingress: { status: APPLICATION_INSTALLED, title: 'Ingress' }, }); - expect(document.querySelector('.js-cluster-application-notice:not(.hidden)')).toBeDefined(); - expect(document.querySelector('.js-cluster-application-notice').textContent.trim()).toEqual('Helm Tiller, Ingress was successfully installed on your cluster'); - }); - - it('hides existing alert when we call again and nothing is newly installed', () => { - const installedState = { - ...INITIAL_APP_MAP, - helm: { status: APPLICATION_INSTALLED, title: 'Helm Tiller' }, - }; - - // Show the banner - cluster.checkForNewInstalls({ - ...INITIAL_APP_MAP, - helm: { status: APPLICATION_INSTALLING, title: 'Helm Tiller' }, - }, installedState); - - expect(document.querySelector('.js-cluster-application-notice:not(.hidden)')).toBeDefined(); - - // Banner should go back hidden - cluster.checkForNewInstalls(installedState, installedState); - - expect(document.querySelector('.js-cluster-application-notice.hidden')).toBeDefined(); + expect(document.querySelector('.js-cluster-application-notice .flash-text')).toBeDefined(); + expect(document.querySelector('.js-cluster-application-notice .flash-text').textContent.trim()).toEqual('Helm Tiller, Ingress was successfully installed on your cluster'); }); }); diff --git a/spec/javascripts/clusters/components/application_row_spec.js b/spec/javascripts/clusters/components/application_row_spec.js index 392cebc5e35..e671c18e1a5 100644 --- a/spec/javascripts/clusters/components/application_row_spec.js +++ b/spec/javascripts/clusters/components/application_row_spec.js @@ -117,7 +117,7 @@ describe('Application Row', () => { expect(vm.installButtonDisabled).toEqual(true); }); - it('has disabled "Install" when APPLICATION_ERROR', () => { + it('has enabled "Install" when APPLICATION_ERROR', () => { vm = mountComponent(ApplicationRow, { ...DEFAULT_APPLICATION_STATE, status: APPLICATION_ERROR, @@ -125,7 +125,7 @@ describe('Application Row', () => { expect(vm.installButtonLabel).toEqual('Install'); expect(vm.installButtonLoading).toEqual(false); - expect(vm.installButtonDisabled).toEqual(true); + expect(vm.installButtonDisabled).toEqual(false); }); it('has loading "Install" when REQUEST_LOADING', () => { |