Merge branch 'open-deployboards-by-default' into 'master'

Make deploy board be visible by default

Closes #2106

See merge request !1595

app/assets/javascripts/environments/stores/environments_store.js

@@ -64,7 +64,7 @@ export default class EnvironmentsStore {
       if (filtered.size === 1 && filtered.rollout_status_path) {
         filtered = Object.assign({}, filtered, {
           hasDeployBoard: true,
-          isDeployBoardVisible: false,
+          isDeployBoardVisible: true,
           deployBoardData: {},
         });
       }

app/models/project_services/mock_deployment_service.rb

@@ -28,6 +28,7 @@ class MockDeploymentService < DeploymentService
   private
 
   def rollout_status_instances
-    JSON.parse(Rails.root.join('spec', 'fixtures', 'rollout_status_instances.json'))
+    data = File.read(Rails.root.join('spec', 'fixtures', 'rollout_status_instances.json'))
+    JSON.parse(data)
   end
 end

app/models/project_services/mock_monitoring_service.rb

@@ -12,6 +12,7 @@ class MockMonitoringService < MonitoringService
   end
 
   def metrics(environment)
-    JSON.parse(Rails.root.join('spec', 'fixtures', 'metrics.json'))
+    data = File.read(Rails.root.join('spec', 'fixtures', 'metrics.json'))
+    JSON.parse(data)
   end
 end

app/policies/project_policy.rb

@@ -74,7 +74,7 @@ class ProjectPolicy < BasePolicy
     can! :read_deployment
     can! :read_merge_request
 
-    if License.current&.add_on?('GitLab_DeployBoard')
+    if License.current&.add_on?('GitLab_DeployBoard') || Rails.env.development?
       can! :read_deploy_board
     end
   end

changelogs/unreleased-ee/make-deployboard-be-visible-by-default.yml

+---
+title: Make deployboard to be visible by default
+merge_request:
+author:

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/environments_store_spec.js

@@ -31,7 +31,7 @@ describe('Store', () => {
       updated_at: '2017-01-31T10:53:46.894Z',
       rollout_status_path: '/path',
       hasDeployBoard: true,
-      isDeployBoardVisible: false,
+      isDeployBoardVisible: true,
       deployBoardData: {},
     };
 
@@ -66,7 +66,7 @@ describe('Store', () => {
 
       store.storeEnvironments([environment]);
       expect(store.state.environments[0].hasDeployBoard).toEqual(true);
-      expect(store.state.environments[0].isDeployBoardVisible).toEqual(false);
+      expect(store.state.environments[0].isDeployBoardVisible).toEqual(true);
       expect(store.state.environments[0].deployBoardData).toEqual({});
     });
 

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);
     });