Merge branch '1595-ee-backport-environments-tests' into 'master'

Backport of EE changes in environments tests

See merge request !10528

spec/javascripts/environments/environment_spec.js

@@ -83,9 +83,10 @@ describe('Environment', () => {
       it('should render a table with environments', (done) => {
         setTimeout(() => {
+          expect(component.$el.querySelectorAll('table')).toBeDefined();
           expect(
-            component.$el.querySelectorAll('table tbody tr').length,
-          ).toEqual(1);
+            component.$el.querySelector('.environment-name').textContent.trim(),
+          ).toEqual(environment.name);
           done();
         }, 0);
       });

spec/javascripts/environments/folder/environments_folder_view_spec.js

@@ -47,9 +47,10 @@ describe('Environments Folder View', () => {
     it('should render a table with environments', (done) => {
       setTimeout(() => {
+        expect(component.$el.querySelectorAll('table')).toBeDefined();
         expect(
-          component.$el.querySelectorAll('table tbody tr').length,
-        ).toEqual(2);
+          component.$el.querySelector('.environment-name').textContent.trim(),
+        ).toEqual(environmentsList[0].name);
         done();
       }, 0);
     });