Update pipelines_spec.js32098-environments-reusable

Fix broken tests

Add end to end test for endpoint and folder name changes

Improve e2e test to use dot in folder name

Update environment_table_spec.js

6 files changed, 60 insertions, 34 deletions

diff --git a/app/assets/javascripts/environments/mixins/environments_mixin.js b/app/assets/javascripts/environments/mixins/environments_mixin.js
index 322a7720304..7219b076721 100644
--- a/app/assets/javascripts/environments/mixins/environments_mixin.js
+++ b/app/assets/javascripts/environments/mixins/environments_mixin.js
@@ -95,7 +95,10 @@ export default {
 
         this.service.postAction(endpoint)
           .then(() => this.fetchEnvironments())
-          .catch(() => Flash(s__('Environments|An error occurred while making the request.')));
+          .catch(() => {
+            this.isLoading = false;
+            Flash(s__('Environments|An error occurred while making the request.'));
+          });
       }
     },
 
diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb
index 161b9b53755..879ee6f4b9b 100644
--- a/spec/features/projects/environments/environments_spec.rb
+++ b/spec/features/projects/environments/environments_spec.rb
@@ -296,6 +296,26 @@ feature 'Environments page', :js do
     end
   end
 
+  describe 'environments folders view' do
+    before do
+      create(:environment, project: project,
+                           name: 'staging.review/review-1',
+                           state: :available)
+      create(:environment, project: project,
+                           name: 'staging.review/review-2',
+                           state: :available)
+    end
+
+    scenario 'user opens folder view' do
+      visit folder_project_environments_path(project, 'staging.review')
+      wait_for_requests
+
+      expect(page).to have_content('Environments / staging.review')
+      expect(page).to have_content('review-1')
+      expect(page).to have_content('review-2')
+    end
+  end
+
   def have_terminal_button
     have_link(nil, href: terminal_project_environment_path(project, environment))
   end
diff --git a/spec/javascripts/environments/environment_table_spec.js b/spec/javascripts/environments/environment_table_spec.js
index d1679eb72f3..9bd42863759 100644
--- a/spec/javascripts/environments/environment_table_spec.js
+++ b/spec/javascripts/environments/environment_table_spec.js
@@ -25,7 +25,7 @@ describe('Environment table', () => {
     };
 
     vm = mountComponent(Component, {
-      environments: [{ mockItem }],
+      environments: [mockItem],
       canCreateDeployment: false,
       canReadEnvironment: true,
     });
diff --git a/spec/javascripts/environments/environments_app_spec.js b/spec/javascripts/environments/environments_app_spec.js
index 8e76efacdc7..d02adb25b4e 100644
--- a/spec/javascripts/environments/environments_app_spec.js
+++ b/spec/javascripts/environments/environments_app_spec.js
@@ -273,6 +273,7 @@ describe('Environment', () => {
       Vue.http.interceptors.push(headersInterceptor);
 
       component = mountComponent(EnvironmentsComponent, mockData);
+      spyOn(history, 'pushState').and.stub();
     });
 
     afterEach(() => {
diff --git a/spec/javascripts/environments/folder/environments_folder_view_spec.js b/spec/javascripts/environments/folder/environments_folder_view_spec.js
index 7d746804d1c..4ea4d9d7499 100644
--- a/spec/javascripts/environments/folder/environments_folder_view_spec.js
+++ b/spec/javascripts/environments/folder/environments_folder_view_spec.js
@@ -200,6 +200,7 @@ describe('Environments Folder View', () => {
       Vue.http.interceptors.push(headersInterceptor);
 
       component = mountComponent(Component, mockData);
+      spyOn(history, 'pushState').and.stub();
     });
 
     afterEach(() => {
diff --git a/spec/javascripts/pipelines/pipelines_spec.js b/spec/javascripts/pipelines/pipelines_spec.js
index c672d13590a..367b42cefb0 100644
--- a/spec/javascripts/pipelines/pipelines_spec.js
+++ b/spec/javascripts/pipelines/pipelines_spec.js
@@ -176,48 +176,49 @@ describe('Pipelines', () => {
     });
   });
 
-  describe('updateContent', () => {
-    it('should set given parameters', () => {
-      component = mountComponent(PipelinesComponent, {
-        store: new Store(),
-      });
-
-      spyOn(component.service, 'getPipelines').and.callThrough();
-      component.updateContent({ scope: 'finished', page: '4' });
-
-      expect(component.page).toEqual('4');
-      expect(component.scope).toEqual('finished');
-      expect(component.requestData.scope).toEqual('finished');
-      expect(component.requestData.page).toEqual('4');
+  describe('methods', () => {
+    beforeEach(() => {
+      spyOn(history, 'pushState').and.stub();
     });
-  });
 
-  describe('onChangeTab', () => {
-    it('should set page to 1', () => {
-      component = mountComponent(PipelinesComponent, {
-        store: new Store(),
+    describe('updateContent', () => {
+      it('should set given parameters', () => {
+        component = mountComponent(PipelinesComponent, {
+          store: new Store(),
+        });
+        component.updateContent({ scope: 'finished', page: '4' });
+
+        expect(component.page).toEqual('4');
+        expect(component.scope).toEqual('finished');
+        expect(component.requestData.scope).toEqual('finished');
+        expect(component.requestData.page).toEqual('4');
       });
-      spyOn(component.service, 'getPipelines').and.callThrough();
-      spyOn(component, 'updateContent');
+    });
 
-      component.onChangeTab('running');
+    describe('onChangeTab', () => {
+      it('should set page to 1', () => {
+        component = mountComponent(PipelinesComponent, {
+          store: new Store(),
+        });
+        spyOn(component, 'updateContent');
 
-      expect(component.updateContent).toHaveBeenCalledWith({ scope: 'running', page: '1' });
-    });
-  });
+        component.onChangeTab('running');
 
-  describe('onChangePage', () => {
-    it('should update page and keep scope', () => {
-      component = mountComponent(PipelinesComponent, {
-        store: new Store(),
+        expect(component.updateContent).toHaveBeenCalledWith({ scope: 'running', page: '1' });
       });
+    });
 
-      spyOn(component.service, 'getPipelines').and.callThrough();
-      spyOn(component, 'updateContent');
+    describe('onChangePage', () => {
+      it('should update page and keep scope', () => {
+        component = mountComponent(PipelinesComponent, {
+          store: new Store(),
+        });
+        spyOn(component, 'updateContent');
 
-      component.onChangePage(4);
+        component.onChangePage(4);
 
-      expect(component.updateContent).toHaveBeenCalledWith({ scope: component.scope, page: '4' });
+        expect(component.updateContent).toHaveBeenCalledWith({ scope: component.scope, page: '4' });
+      });
     });
   });
 });