Merge branch 'master' into scheduled-manual-jobs-environment-play-buttons

Conflicts:
	spec/javascripts/environments/environment_actions_spec.js

4 files changed, 23 insertions, 16 deletions

diff --git a/spec/javascripts/environments/emtpy_state_spec.js b/spec/javascripts/environments/emtpy_state_spec.js
index 10a19af4175..d71dfe8197e 100644
--- a/spec/javascripts/environments/emtpy_state_spec.js
+++ b/spec/javascripts/environments/emtpy_state_spec.js
@@ -27,7 +27,7 @@ describe('environments empty state', () => {
     it('renders empty state and new environment button', () => {
       expect(
         vm.$el.querySelector('.js-blank-state-title').textContent.trim(),
-      ).toEqual('You don\'t have any environments right now.');
+      ).toEqual('You don\'t have any environments right now');
 
       expect(
         vm.$el.querySelector('.js-new-environment-button').getAttribute('href'),
@@ -47,7 +47,7 @@ describe('environments empty state', () => {
     it('renders empty state without new button', () => {
       expect(
         vm.$el.querySelector('.js-blank-state-title').textContent.trim(),
-      ).toEqual('You don\'t have any environments right now.');
+      ).toEqual('You don\'t have any environments right now');
 
       expect(
         vm.$el.querySelector('.js-new-environment-button'),
diff --git a/spec/javascripts/environments/environment_actions_spec.js b/spec/javascripts/environments/environment_actions_spec.js
index 0fbfe95915e..787df757d32 100644
--- a/spec/javascripts/environments/environment_actions_spec.js
+++ b/spec/javascripts/environments/environment_actions_spec.js
@@ -38,6 +38,7 @@ describe('EnvironmentActions Component', () => {
       expect(vm.$el.querySelector('.dropdown-new').getAttribute('data-original-title')).toEqual(
         'Deploy to...',
       );
+
       expect(vm.$el.querySelector('.dropdown-new').getAttribute('aria-label')).toEqual(
         'Deploy to...',
       );
diff --git a/spec/javascripts/environments/environments_app_spec.js b/spec/javascripts/environments/environments_app_spec.js
index 6968fbc7ce7..7edc0ccac0b 100644
--- a/spec/javascripts/environments/environments_app_spec.js
+++ b/spec/javascripts/environments/environments_app_spec.js
@@ -50,7 +50,7 @@ describe('Environment', () => {
 
         expect(
           component.$el.querySelector('.js-blank-state-title').textContent,
-        ).toContain('You don\'t have any environments right now.');
+        ).toContain('You don\'t have any environments right now');
       });
     });
 
@@ -94,6 +94,7 @@ describe('Environment', () => {
           spyOn(component, 'updateContent');
           setTimeout(() => {
             component.$el.querySelector('.gl-pagination li:nth-child(5) a').click();
+
             expect(component.updateContent).toHaveBeenCalledWith({ scope: 'available', page: '2' });
             done();
           }, 0);
@@ -126,7 +127,7 @@ describe('Environment', () => {
     it('should render empty state', () => {
       expect(
         component.$el.querySelector('.js-blank-state-title').textContent,
-      ).toContain('You don\'t have any environments right now.');
+      ).toContain('You don\'t have any environments right now');
     });
   });
 
@@ -158,12 +159,7 @@ describe('Environment', () => {
         component.$el.querySelector('.folder-name').click();
 
         Vue.nextTick(() => {
-          expect(
-            component.$el.querySelector('.folder-icon i.fa-caret-right').getAttribute('style'),
-          ).toContain('display: none');
-          expect(
-            component.$el.querySelector('.folder-icon i.fa-caret-down').getAttribute('style'),
-          ).not.toContain('display: none');
+          expect(component.$el.querySelector('.folder-icon.ic-chevron-right')).toBe(null);
           done();
         });
       }, 0);
@@ -179,12 +175,7 @@ describe('Environment', () => {
           component.$el.querySelector('.folder-name').click();
 
           Vue.nextTick(() => {
-            expect(
-              component.$el.querySelector('.folder-icon i.fa-caret-down').getAttribute('style'),
-            ).toContain('display: none');
-            expect(
-              component.$el.querySelector('.folder-icon i.fa-caret-right').getAttribute('style'),
-            ).not.toContain('display: none');
+            expect(component.$el.querySelector('.folder-icon.ic-chevron-down')).toBe(null);
             done();
           });
         });
diff --git a/spec/javascripts/environments/environments_store_spec.js b/spec/javascripts/environments/environments_store_spec.js
index f2c6ec24dd7..c3d16f10d72 100644
--- a/spec/javascripts/environments/environments_store_spec.js
+++ b/spec/javascripts/environments/environments_store_spec.js
@@ -17,23 +17,27 @@ describe('Store', () => {
 
   it('should store environments', () => {
     store.storeEnvironments(serverData);
+
     expect(store.state.environments.length).toEqual(serverData.length);
     expect(store.state.environments[0]).toEqual(environmentsList[0]);
   });
 
   it('should store available count', () => {
     store.storeAvailableCount(2);
+
     expect(store.state.availableCounter).toEqual(2);
   });
 
   it('should store stopped count', () => {
     store.storeStoppedCount(2);
+
     expect(store.state.stoppedCounter).toEqual(2);
   });
 
   describe('store environments', () => {
     it('should store environments', () => {
       store.storeEnvironments(serverData);
+
       expect(store.state.environments.length).toEqual(serverData.length);
     });
 
@@ -45,6 +49,7 @@ describe('Store', () => {
       };
 
       store.storeEnvironments([environment]);
+
       expect(store.state.environments[0].isFolder).toEqual(true);
       expect(store.state.environments[0].folderName).toEqual('bar');
     });
@@ -61,17 +66,20 @@ describe('Store', () => {
       };
 
       store.storeEnvironments([environment]);
+
       expect(store.state.environments[0].last_deployment).toEqual({});
       expect(store.state.environments[0].isStoppable).toEqual(true);
     });
 
     it('should store latest.name when the environment is not a folder', () => {
       store.storeEnvironments(serverData);
+
       expect(store.state.environments[0].name).toEqual(serverData[0].latest.name);
     });
 
     it('should store root level name when environment is a folder', () => {
       store.storeEnvironments(serverData);
+
       expect(store.state.environments[1].folderName).toEqual(serverData[1].name);
     });
   });
@@ -81,9 +89,11 @@ describe('Store', () => {
       store.storeEnvironments(serverData);
 
       store.toggleFolder(store.state.environments[1]);
+
       expect(store.state.environments[1].isOpen).toEqual(true);
 
       store.toggleFolder(store.state.environments[1]);
+
       expect(store.state.environments[1].isOpen).toEqual(false);
     });
 
@@ -91,9 +101,11 @@ describe('Store', () => {
       store.storeEnvironments(serverData);
 
       store.toggleFolder(store.state.environments[1]);
+
       expect(store.state.environments[1].isOpen).toEqual(true);
 
       store.storeEnvironments(serverData);
+
       expect(store.state.environments[1].isOpen).toEqual(true);
     });
   });
@@ -116,6 +128,7 @@ describe('Store', () => {
       expect(store.state.environments[1].children.length).toEqual(serverData.length);
       // poll
       store.storeEnvironments(serverData);
+
       expect(store.state.environments[1].children.length).toEqual(serverData.length);
     });
   });
@@ -141,6 +154,7 @@ describe('Store', () => {
       };
 
       store.setPagination(pagination);
+
       expect(store.state.paginationInformation).toEqual(expectedResult);
     });
   });
@@ -150,6 +164,7 @@ describe('Store', () => {
       store.storeEnvironments(serverData);
 
       store.toggleFolder(store.state.environments[1]);
+
       expect(store.getOpenFolders()[0]).toEqual(store.state.environments[1]);
     });
   });