fix failing tests related to LDAP when running on CI (mattermost#5501)

josephk96 · May 15, 2020 · 6befd92 · 6befd92
1 parent 7116e5a
commit 6befd92
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/e2e/cypress.json b/e2e/cypress.json
@@ -12,6 +12,7 @@
  "webhookBaseUrl": "https://localhost:3000",
  "setChromeWebSecurity": true,
  "ldapServer": "localhost",
- "ldapPort": 389
+ "ldapPort": 389,
+ "runLDAPSync": true
  }
 }
diff --git a/e2e/cypress/integration/enterprise/ldap_group/channel_modes_spec.js b/e2e/cypress/integration/enterprise/ldap_group/channel_modes_spec.js
@@ -24,7 +24,9 @@ describe('Test channel public/private toggle', () => {
  });
 
  // # Check and run LDAP Sync job
- cy.checkRunLDAPSync();
+ if (Cypress.env('runLDAPSync')) {
+ cy.checkRunLDAPSync();
+ }
  });
 
  it('Verify that System Admin can change channel privacy using toggle', () => {

diff --git a/e2e/cypress/integration/enterprise/ldap_group/groups_assign_roles_spec.js b/e2e/cypress/integration/enterprise/ldap_group/groups_assign_roles_spec.js
@@ -58,7 +58,9 @@ describe('System Console', () => {
  cy.apiUpdateConfig({LdapSettings: {Enable: true}});
 
  // # Check and run LDAP Sync job
- cy.checkRunLDAPSync();
+ if (Cypress.env('runLDAPSync')) {
+ cy.checkRunLDAPSync();
+ }
  });
 
  it('MM-20058 - System Admin can map roles to teams and channels via group configuration page', () => {

diff --git a/e2e/cypress/integration/enterprise/ldap_group/team_and_channel_assign_roles_spec.js b/e2e/cypress/integration/enterprise/ldap_group/team_and_channel_assign_roles_spec.js
@@ -28,7 +28,9 @@ describe('System Console', () => {
  cy.apiUpdateConfig({LdapSettings: {Enable: true}});
 
  // # Check and run LDAP Sync job
- cy.checkRunLDAPSync();
+ if (Cypress.env('runLDAPSync')) {
+ cy.checkRunLDAPSync();
+ }
  });
 
  it('MM-20059 - System Admin can map roles to groups from Team Configuration screen', () => {