Cypress/E2E: Move cypress channel api commands

e2e/cypress/integration/accessibility/accessibility_input_fields_spec.js

@@ -64,8 +64,8 @@ describe('Verify Accessibility Support in different input fields', () => {
  });
 
  beforeEach(() => {
- cy.apiCreateChannel(testTeam.id, 'accessibility', 'accessibility').then((response) => {
- testChannel = response.body;
+ cy.apiCreateChannel(testTeam.id, 'accessibility', 'accessibility').then(({channel}) => {
+ testChannel = channel;
  cy.visit(`/${testTeam.name}/channels/${testChannel.name}`);
  });
  });

e2e/cypress/integration/channel/add_users_to_channel_spec.js

@@ -73,8 +73,8 @@ describe('CS15445 Join/leave messages', () => {
 
  it('Single User: Usernames are links, open profile popovers', () => {
  // # Create and visit new channel
- cy.apiCreateChannel(testTeam.id, 'channel-test', 'Channel').then((res) => {
- cy.visit(`/${testTeam.name}/channels/${res.body.name}`);
+ cy.apiCreateChannel(testTeam.id, 'channel-test', 'Channel').then(({channel}) => {
+ cy.visit(`/${testTeam.name}/channels/${channel.name}`);
 
  // # Add users to channel
  addNumberOfUsersToChannel(1);
@@ -91,8 +91,8 @@ describe('CS15445 Join/leave messages', () => {
 
  it('Combined Users: Usernames are links, open profile popovers', () => {
  // # Create and visit new channel
- cy.apiCreateChannel(testTeam.id, 'channel-test', 'Channel').then((res) => {
- cy.visit(`/${testTeam.name}/channels/${res.body.name}`);
+ cy.apiCreateChannel(testTeam.id, 'channel-test', 'Channel').then(({channel}) => {
+ cy.visit(`/${testTeam.name}/channels/${channel.name}`);
 
  addNumberOfUsersToChannel(3);
 

e2e/cypress/integration/channel/channel_mention_autocomplete_spec.js

@@ -25,8 +25,8 @@ describe('Channel', () => {
  ownChannel = channel;
  testUser = user;
 
- cy.apiCreateChannel(testTeam.id, 'delta-test', 'Delta Channel').then((res) => {
- otherChannel = res.body;
+ cy.apiCreateChannel(testTeam.id, 'delta-test', 'Delta Channel').then((out) => {
+ otherChannel = out.channel;
  });
 
  cy.apiLogin(testUser);

e2e/cypress/integration/channel/channel_name_tooltips_spec.js

@@ -14,10 +14,8 @@ import * as TIMEOUTS from '../../fixtures/timeouts';
 
 const timestamp = Date.now();
 
-function verifyChannel(res, verifyExistence = true) {
- const channel = res.body;
-
- // # Wait for Channel to be c
+function verifyChannel(channel, verifyExistence = true) {
+ // # Wait for Channel to be created
  cy.wait(TIMEOUTS.HALF_SEC);
 
  // # Hover on the channel name
@@ -63,8 +61,8 @@ describe('channel name tooltips', () => {
  testTeam.id,
  'channel-test',
  `Public channel with a long name-${timestamp}`,
- ).then((res) => {
- verifyChannel(res);
+ ).then(({channel}) => {
+ verifyChannel(channel);
  });
  });
 
@@ -75,8 +73,8 @@ describe('channel name tooltips', () => {
  'channel-test',
  `Private channel with a long name-${timestamp}`,
  'P',
- ).then((res) => {
- verifyChannel(res);
+ ).then(({channel}) => {
+ verifyChannel(channel);
  });
  });
 
@@ -86,8 +84,8 @@ describe('channel name tooltips', () => {
  testTeam.id,
  'channel-test',
  'Public channel',
- ).then((res) => {
- verifyChannel(res, false);
+ ).then(({channel}) => {
+ verifyChannel(channel, false);
  });
  });
 
@@ -98,8 +96,8 @@ describe('channel name tooltips', () => {
  'channel-test',
  'Private channel',
  'P',
- ).then((res) => {
- verifyChannel(res, false);
+ ).then(({channel}) => {
+ verifyChannel(channel, false);
  });
  });
 

e2e/cypress/integration/channel/channel_routing_spec.js

@@ -46,23 +46,21 @@ describe('Channel routing', () => {
 
  it('should go to private channel view', () => {
  // # Create a private channel
- cy.apiCreateChannel(testTeam.id, 'private-channel', 'Private channel', 'P').then((response) => {
+ cy.apiCreateChannel(testTeam.id, 'private-channel', 'Private channel', 'P').then(({channel}) => {
  // # Go to the newly created channel
- cy.visit(`/${testTeam.name}/channels/${response.body.name}`);
+ cy.visit(`/${testTeam.name}/channels/${channel.name}`);
 
  // * Check you can go to the channel without problem
  cy.get('#channelHeaderTitle').should('be.visible').should('contain', 'Private channel');
 
  // # Remove the created channel
- cy.apiDeleteChannel(response.body.id);
+ cy.apiDeleteChannel(channel.id);
  });
  });
 
  it('should go to self direct channel using the multiple ways to go', () => {
  // # Create a self direct channel
- cy.apiCreateDirectChannel([testUser.id, testUser.id]).then((response) => {
- const ownDMChannel = response.body;
-
+ cy.apiCreateDirectChannel([testUser.id, testUser.id]).then(({channel: ownDMChannel}) => {
  // # Visit the channel using the channel name
  cy.visit(`/${testTeam.name}/channels/${testUser.id}__${testUser.id}`);
 
@@ -91,9 +89,7 @@ describe('Channel routing', () => {
 
  it('should go to other user direct channel using multiple ways to go', () => {
  // # Create a direct channel between two users
- cy.apiCreateDirectChannel([testUser.id, otherUser1.id]).then((response) => {
- const dmChannel = response.body;
-
+ cy.apiCreateDirectChannel([testUser.id, otherUser1.id]).then(({channel: dmChannel}) => {
  // # Visit the channel using the channel name
  cy.visit(`/${testTeam.name}/channels/${testUser.id}__${otherUser1.id}`);
 
@@ -124,9 +120,7 @@ describe('Channel routing', () => {
  const userGroupIds = [testUser.id, otherUser1.id, otherUser2.id];
 
  // # Create a group channel for 3 users
- cy.apiCreateGroupChannel(userGroupIds).then((response) => {
- const gmChannel = response.body;
-
+ cy.apiCreateGroupChannel(userGroupIds).then(({channel: gmChannel}) => {
  // # Visit the channel using the name using the channels route
  cy.visit(`/${testTeam.name}/channels/${gmChannel.name}`);
 

e2e/cypress/integration/channel/channel_settings_spec.js

@@ -14,8 +14,8 @@
 describe('Channel Settings', () => {
  before(() => {
  cy.apiInitSetup().then(({team, user}) => {
- cy.apiCreateChannel(team.id, 'channel', 'Private Channel', 'P').then((res) => {
- cy.apiAddUserToChannel(res.body.id, user.id);
+ cy.apiCreateChannel(team.id, 'channel', 'Private Channel', 'P').then(({channel}) => {
+ cy.apiAddUserToChannel(channel.id, user.id);
  });
 
  cy.apiLogin(user);

e2e/cypress/integration/channel/close_direct_group_spec.js

@@ -62,9 +62,7 @@ describe('Close direct messages', () => {
  });
 
  function createAndVisitDMChannel(userIds) {
- return cy.apiCreateDirectChannel(userIds).then((res) => {
- const channel = res.body;
-
+ return cy.apiCreateDirectChannel(userIds).then(({channel}) => {
  // # Visit the new channel
  cy.visit(`/${testTeam.name}/channels/${channel.name}`);
 
@@ -124,9 +122,7 @@ describe('Close group messages', () => {
 
  function createAndVisitGMChannel(users = []) {
  const userIds = users.map((user) => user.id);
- return cy.apiCreateGroupChannel(userIds).then((res) => {
- const channel = res.body;
-
+ return cy.apiCreateGroupChannel(userIds).then(({channel}) => {
  // # Visit the new channel
  cy.visit(`/${testTeam.name}/channels/${channel.name}`);
 

e2e/cypress/integration/channel/convert_channel_to_private_spec.js

@@ -33,9 +33,7 @@ describe('Channels', () => {
  cy.apiLogin(testUser);
 
  // # Create new test channel
- cy.apiCreateChannel(testTeam.id, 'channel-test', 'Channel').then((channelRes) => {
- const channel = channelRes.body;
-
+ cy.apiCreateChannel(testTeam.id, 'channel-test', 'Channel').then(({channel}) => {
  // # Go to test channel
  cy.visit(`/${testTeam.name}/channels/${channel.name}`);
 
@@ -60,9 +58,7 @@ describe('Channels', () => {
  cy.apiLogin(testUser);
 
  // # Create new test channel
- cy.apiCreateChannel(testTeam.id, 'channel-test', 'Channel').then((channelRes) => {
- const channel = channelRes.body;
-
+ cy.apiCreateChannel(testTeam.id, 'channel-test', 'Channel').then(({channel}) => {
  // # Go to test channel
  cy.visit(`/${testTeam.name}/channels/${channel.name}`);
 
@@ -87,9 +83,7 @@ describe('Channels', () => {
  cy.apiLogin(testUser);
 
  // # Create new test channel
- cy.apiCreateChannel(testTeam.id, 'channel-test', 'Channel').then((channelRes) => {
- const channel = channelRes.body;
-
+ cy.apiCreateChannel(testTeam.id, 'channel-test', 'Channel').then(({channel}) => {
  // # Go to test channel
  cy.visit(`/${testTeam.name}/channels/${channel.name}`);
 
@@ -107,9 +101,7 @@ describe('Channels', () => {
  cy.apiLogin(testUser);
 
  // # Create new test channel
- cy.apiCreateChannel(testTeam.id, 'channel-test', 'Channel').then((channelRes) => {
- const channel = channelRes.body;
-
+ cy.apiCreateChannel(testTeam.id, 'channel-test', 'Channel').then(({channel}) => {
  // # Go to test channel
  cy.visit(`/${testTeam.name}/channels/${channel.name}`);
 

e2e/cypress/integration/channel/more_channels_spec.js

@@ -31,8 +31,8 @@ describe('Channels', () => {
 
  cy.apiLogin(testUser).then(() => {
  // # Create new test channel
- cy.apiCreateChannel(testTeam.id, 'channel-test', 'Channel').then((channelRes) => {
- testChannel = channelRes.body;
+ cy.apiCreateChannel(testTeam.id, 'channel-test', 'Channel').then(({channel}) => {
+ testChannel = channel;
  });
 
  // # Go to town square

e2e/cypress/integration/channel_settings/more_unreads_position_with_scroll_spec.js

@@ -35,12 +35,10 @@ describe('Channel settings', () => {
  // # Create 20 channels (based on length of channelNames array) to ensure that the channels list is scrollable
  cy.wrap(channelNames).each((name) => {
  const displayName = `channel-${name}`;
- cy.apiCreateChannel(team.id, name, displayName, 'O', '', '', false).then((response) => {
- const testChannel = response.body;
-
+ cy.apiCreateChannel(team.id, name, displayName, 'O', '', '', false).then(({channel}) => {
  // # Add our 2 created users to each channel so they can both post messages
- cy.apiAddUserToChannel(testChannel.id, mainUser.id);
- cy.apiAddUserToChannel(testChannel.id, otherUser.id);
+ cy.apiAddUserToChannel(channel.id, mainUser.id);
+ cy.apiAddUserToChannel(channel.id, otherUser.id);
  });
  });
  });

e2e/cypress/integration/channel_sidebar/dm_category_spec.js

@@ -51,9 +51,7 @@ describe('MM-T3156 DM category', () => {
  usersPrefixes.forEach((prefix) => {
  // # Create users with prefixes in alphabetical order
  cy.apiCreateUser({prefix}).then(({user: newUser}) => {
- cy.apiCreateDirectChannel([testUser.id, newUser.id]).then((res) => {
- const channel = res.body;
-
+ cy.apiCreateDirectChannel([testUser.id, newUser.id]).then(({channel}) => {
  // # Post message in The DM channel
  cy.postMessageAs({sender: newUser, message: 'test', channelId: channel.id});
 

e2e/cypress/integration/enterprise/elasticsearch_autocomplete/channels_spec.js

@@ -125,8 +125,8 @@ describe('Autocomplete with Elasticsearch - Channel', () => {
  const name = 'hellothere';
 
  // # Create a new channel
- cy.apiCreateChannel(testTeam.id, name, name).then((channelResponse) => {
- channelId = channelResponse.body.id;
+ cy.apiCreateChannel(testTeam.id, name, name).then(({channel}) => {
+ channelId = channel.id;
  });
 
  // * Verify channel without special characters appears normally

e2e/cypress/integration/enterprise/elasticsearch_autocomplete/renaming_spec.js

@@ -69,9 +69,7 @@ describe('Autocomplete with Elasticsearch - Renaming', () => {
  const newChannelName = 'updatedchannel' + Date.now();
 
  // # Create a new channel
- cy.apiCreateChannel(testTeam.id, channelName, channelName).then((channelResponse) => {
- const channel = channelResponse.body;
-
+ cy.apiCreateChannel(testTeam.id, channelName, channelName).then(({channel}) => {
  // # Channel should appear in search results pre-change
  searchAndVerifyChannel(channel);
 
@@ -118,8 +116,8 @@ describe('Autocomplete with Elasticsearch - Renaming', () => {
  const channelName = 'another-channel' + Date.now();
 
  // # Create a new channel
- cy.apiCreateChannel(testTeam.id, channelName, channelName).then((channelResponse) => {
- testChannel = channelResponse.body;
+ cy.apiCreateChannel(testTeam.id, channelName, channelName).then(({channel}) => {
+ testChannel = channel;
 
  // # Channel should appear in search results pre-change
  searchAndVerifyChannel(testChannel);

e2e/cypress/integration/enterprise/elasticsearch_autocomplete/users_spec.js

@@ -301,9 +301,7 @@ describe('Autocomplete with Elasticsearch - Users', () => {
 
  // # Create new channel and add user to channel
  const channelName = `new-channel-${timestamp}`;
- cy.apiCreateChannel(testTeam.id, channelName, channelName).then((channelResponse) => {
- const channel = channelResponse.body;
-
+ cy.apiCreateChannel(testTeam.id, channelName, channelName).then(({channel}) => {
  cy.apiGetUserByEmail(thor.email).then(({user}) => {
  cy.apiAddUserToChannel(channel.id, user.id);
  });

e2e/cypress/integration/enterprise/ldap/ldap_group_sync_spec.js

@@ -69,8 +69,8 @@ context('ldap', () => {
  });
 
  // # Create a test channel
- cy.apiCreateChannel(testTeam.id, 'ldap-group-sync-automated-tests', 'ldap-group-sync-automated-tests').then((response) => {
- testChannel = response.body;
+ cy.apiCreateChannel(testTeam.id, 'ldap-group-sync-automated-tests', 'ldap-group-sync-automated-tests').then(({channel}) => {
+ testChannel = channel;
  });
  });
  });
@@ -240,8 +240,8 @@ context('ldap', () => {
  'private-channel-test',
  'Private channel',
  'P',
- ).then((res) => {
- const privateChannel = res.body;
+ ).then(({channel}) => {
+ const privateChannel = channel;
 
  // # Visit channel configuration of private channel
  cy.visit(`/admin_console/user_management/channels/${privateChannel.id}`);
@@ -389,8 +389,7 @@ context('ldap', () => {
  'a-channel-im-not-apart-off',
  'Public channel',
  'O',
- ).then((res) => {
- const publicChannel = res.body;
+ ).then(({channel: publicChannel}) => {
  cy.apiLogin(testUser);
 
  cy.visit(`/${testTeam.name}/channels/${testChannel.name}`);
@@ -444,8 +443,7 @@ context('ldap', () => {
  'a-channel-im-not-apart-off',
  'Public channel',
  'O',
- ).then((res) => {
- const publicChannel = res.body;
+ ).then(({channel: publicChannel}) => {
  cy.apiLogin(testUser);
 
  // # Click more under public channels
@@ -460,7 +458,7 @@ context('ldap', () => {
  cy.apiAdminLogin();
  cy.apiPatchChannelPrivacy(publicChannel.id, 'P');
 
- // # Login as a nromal user
+ // # Login as a normal user
  cy.apiLogin(testUser);
 
  // # Click more under public channels

e2e/cypress/integration/enterprise/ldap_group/channel_modes_spec.js

@@ -37,8 +37,7 @@ describe('Test channel public/private toggle', () => {
  });
 
  it('Verify that System Admin can change channel privacy using toggle', () => {
- cy.apiCreateChannel(testTeam.id, 'test-channel', 'Test Channel').then((res) => {
- const channel = res.body;
+ cy.apiCreateChannel(testTeam.id, 'test-channel', 'Test Channel').then(({channel}) => {
  assert(channel.type === 'O');
  cy.visit(`/admin_console/user_management/channels/${channel.id}`);
  cy.get('#channel_profile').contains(channel.display_name);
@@ -62,8 +61,7 @@ describe('Test channel public/private toggle', () => {
  });
 
  it('Verify that resetting sync toggle doesn\'t alter channel privacy toggle', () => {
- cy.apiCreateChannel(testTeam.id, 'test-channel', 'Test Channel').then((res) => {
- const channel = res.body;
+ cy.apiCreateChannel(testTeam.id, 'test-channel', 'Test Channel').then(({channel}) => {
  assert(channel.type === 'O');
  cy.visit(`/admin_console/user_management/channels/${channel.id}`);
  cy.get('#channel_profile').contains(channel.display_name);