MM-14391 Reorganize command to reset account settings via API and sep…

…arate API and UI commands (mattermost#2600) * reorganize command to reset account settings via API and separated API and UI commands * replaced pixel value with CSS class validation, and removed unnecessary test
codearth01 · Sep 9, 2019 · c7e6fcd · c7e6fcd
1 parent 9961413
commit c7e6fcd
Show file tree

Hide file tree

Showing 23 changed files with 190 additions and 176 deletions.
diff --git a/components/post_view/post/post.jsx b/components/post_view/post/post.jsx
@@ -247,7 +247,10 @@ export default class Post extends React.PureComponent {
  onMouseLeave={this.unsetHover}
  onTouchStart={this.setHover}
  >
- <div className={'post__content ' + centerClass}>
+ <div
+ id='postContent'
+ className={'post__content ' + centerClass}
+ >
  <div className='post__img'>
  {profilePic}
  </div>

diff --git a/cypress/integration/account_settings/display/channel_display_mode_spec.js b/cypress/integration/account_settings/display/channel_display_mode_spec.js
@@ -9,11 +9,15 @@
 
 describe('Account Settings > Display > Channel Display Mode', () => {
  before(() => {
- cy.login('user-1');
+ cy.apiLogin('user-1');
 
  // 1. Set default preference of a user on channel and message display
- cy.updateChannelDisplayModePreference('centered');
- cy.updateMessageDisplayPreference();
+ cy.apiSaveChannelDisplayModePreference('centered');
+ cy.apiSaveMessageDisplayPreference();
+
+ // Post a message to a channel
+ cy.visit('/');
+ cy.postMessage('Test for channel display mode {enter}');
  });
 
  beforeEach(() => {
@@ -76,9 +80,9 @@ describe('Account Settings > Display > Channel Display Mode', () => {
  // 8. Go to channel which has any posts
  cy.get('#sidebarItem_town-square').click();
 
- // * Validate if the post content in center channel is fulled.
- // * 1179px is fulled width when the viewport width is 1500px
- cy.get('.post__content').last().should('have.css', 'width', '1179px');
+ // * Validate if the post content in center channel is full width
+ // by checking the exact class name.
+ cy.get('#postContent').first().invoke('attr', 'class').should('contain', 'post__content').should('not.contain', 'center');
  });
 
  it('AS13225 Channel display mode setting to "Fixed width, centered"', () => {
@@ -113,22 +117,8 @@ describe('Account Settings > Display > Channel Display Mode', () => {
  // 8. Go to channel which has any posts
  cy.get('#sidebarItem_town-square').click();
 
- //* Validate if the post content in center channel is fixed and centered
- cy.get('.post__content').last().should('have.css', 'width', '1000px');
- cy.get('.post__content').last().should('have.class', 'center');
- });
-
- it('Width of center view when message display is compact and channel display mode is either centered or full', () => {
- // 1. Set message display to compact with channel display mode set to centered
- cy.updateMessageDisplayPreference('compact');
-
- // * Verify that the width is at 1000px
- cy.get('.post__content').last().should('have.css', 'width', '1000px');
-
- // 2. Set channel display mode to full (default) with message display in compact
- cy.updateChannelDisplayModePreference();
-
- // * Verify that the width is at 1123px
- cy.get('.post__content').last().should('have.css', 'width', '1123px');
+ // * Validate if the post content in center channel is fixed and centered
+ // by checking the exact class name.
+ cy.get('#postContent').first().invoke('attr', 'class').should('contain', 'post__content center');
  });
 });
diff --git a/cypress/integration/account_settings/display/code_theme_colors_spec.js b/cypress/integration/account_settings/display/code_theme_colors_spec.js
@@ -41,7 +41,7 @@ function navigateToThemeSettings() {
 describe('AS14319 Theme Colors - Code', () => {
  before(() => {
  // 1. Login and navigate to the app
- cy.login('user-1');
+ cy.apiLogin('user-1');
  cy.visit('/');
 
  // 2. Enter in code block for message

diff --git a/cypress/integration/account_settings/theme_color/custom_colors_sidebar_styles_spec.js b/cypress/integration/account_settings/theme_color/custom_colors_sidebar_styles_spec.js
@@ -28,12 +28,12 @@ const testCases = [
 describe('AS14318 Theme Colors - Color Picker', () => {
  before(() => {
  // 1. Set default theme preference
- cy.updateThemePreference();
+ cy.apiSaveThemePreference();
  });
 
  after(() => {
  // * Revert to default theme preference
- cy.updateThemePreference();
+ cy.apiSaveThemePreference();
  });
 
  it('Theme Display should render in min setting view', () => {

diff --git a/cypress/integration/at_mentions/at_mentions_spec.js b/cypress/integration/at_mentions/at_mentions_spec.js
@@ -71,7 +71,7 @@ describe('at-mention', () => {
 
  // 1. Login and navigate to the app
  cy.get('@receiver').then((receiver) => {
- cy.login(receiver.username);
+ cy.apiLogin(receiver.username);
  });
 
  cy.visit('/');

diff --git a/cypress/integration/channel/autocomplete_shown_each_channel_spec.js b/cypress/integration/channel/autocomplete_shown_each_channel_spec.js
@@ -10,7 +10,7 @@
 describe('Identical Message Drafts', () => {
  before(() => {
  // 1. Login and go to /
- cy.login('user-1');
+ cy.apiLogin('user-1');
  cy.visit('/');
 
  // 2. Clear channel textbox

diff --git a/cypress/integration/channel/collapsed_message_spec.js b/cypress/integration/channel/collapsed_message_spec.js
@@ -28,7 +28,7 @@ function verifyExpandedPost() {
 describe('Long message', () => {
  it('M14321 will show more/less content correctly', () => {
  // 1. Login as "user-1" and go to /
- cy.login('user-1');
+ cy.apiLogin('user-1');
  cy.visit('/');
 
  // 2. Post message with kitchen sink markdown text

diff --git a/cypress/integration/channel/edit_message_spec.js b/cypress/integration/channel/edit_message_spec.js
@@ -12,7 +12,7 @@
 describe('Edit Message', () => {
  it('M13909 Escape should not close modal when an autocomplete drop down is in use', () => {
  // 1. Login as "user-1" and go to /
- cy.login('user-1');
+ cy.apiLogin('user-1');
  cy.visit('/');
 
  // 2. Post message "Hello"
@@ -66,7 +66,7 @@ describe('Edit Message', () => {
 
  it('M13482 Display correct timestamp for edited message', () => {
  // 1. Login as "user-1" and go to /
- cy.login('user-1');
+ cy.apiLogin('user-1');
  cy.visit('/');
 
  // 2. Post a message

diff --git a/cypress/integration/channel/header_spec.js b/cypress/integration/channel/header_spec.js
@@ -10,7 +10,7 @@
 describe('Header', () => {
  before(() => {
  // 1. Login and go to /
- cy.login('user-1');
+ cy.apiLogin('user-1');
  cy.visit('/');
  });
 

diff --git a/cypress/integration/channel/message_bullets_spec.js b/cypress/integration/channel/message_bullets_spec.js
@@ -12,7 +12,7 @@
 describe('Message', () => {
  it('M13326 Text in bullet points is the same size as text above and below it', () => {
  // 1. Login and navigate to the app
- cy.login('user-1');
+ cy.apiLogin('user-1');
  cy.visit('/');
 
  // 2. Enter in text

diff --git a/cypress/integration/channel/message_draft_spec.js b/cypress/integration/channel/message_draft_spec.js
@@ -10,7 +10,7 @@
 describe('Message Draft', () => {
  before(() => {
  // 1. Login and go to /
- cy.login('user-1');
+ cy.apiLogin('user-1');
  cy.visit('/');
  });
 

diff --git a/cypress/integration/channel/message_draft_then_switch_channel_spec.js b/cypress/integration/channel/message_draft_then_switch_channel_spec.js
@@ -10,7 +10,7 @@
 describe('Message Draft and Switch Channels', () => {
  before(() => {
  // 1. Login and go to /
- cy.login('user-1');
+ cy.apiLogin('user-1');
  cy.visit('/');
  });
 

diff --git a/cypress/integration/channel/message_edit_post_with_attachment_spec.js b/cypress/integration/channel/message_edit_post_with_attachment_spec.js
@@ -12,7 +12,7 @@
 describe('MM-13697 Edit Post with attachment', () => {
  before(() => {
  // 1. Login and go to /
- cy.login('user-1');
+ cy.apiLogin('user-1');
  cy.visit('/');
  });
 

diff --git a/cypress/integration/channel/message_spec.js b/cypress/integration/channel/message_spec.js
@@ -12,14 +12,14 @@
 describe('Message', () => {
  it('M13701 Consecutive message does not repeat profile info', () => {
  // 1. Login as sysadmin and go to /
- cy.login('sysadmin');
+ cy.apiLogin('sysadmin');
  cy.visit('/');
 
  // 2. Post a message to force next user message to display a message
  cy.postMessage('Hello');
 
  // 3. Login as "user-1" and go to /
- cy.login('user-1');
+ cy.apiLogin('user-1');
  cy.visit('/');
 
  // 4. Post message "One"
@@ -43,7 +43,7 @@ describe('Message', () => {
 
  it('M14012 Focus move to main input box when a character key is selected', () => {
  // 1. Login and go to /
- cy.login('user-1');
+ cy.apiLogin('user-1');
  cy.visit('/');
 
  // 2. Post message
@@ -73,7 +73,7 @@ describe('Message', () => {
 
  it('M14320 @here., @all. and @channel. (ending in a period) still highlight', () => {
  // 1. Login and go to /
- cy.login('user-1');
+ cy.apiLogin('user-1');
  cy.visit('/');
 
  // 2. Post message

diff --git a/cypress/integration/channel/system_message_spec.js b/cypress/integration/channel/system_message_spec.js
@@ -49,7 +49,7 @@ function getLines(e) {
 describe('System Message', () => {
  before(() => {
  // 1. Login and go to /
- cy.login('user-1');
+ cy.apiLogin('user-1');
  cy.visit('/');
  cy.updateTeammateDisplayModePreference();
  });

diff --git a/cypress/integration/login/login_spec.js b/cypress/integration/login/login_spec.js
@@ -9,7 +9,7 @@
 
 describe('Login page', () => {
  before(() => {
- cy.logoutByAPI();
+ cy.apiLogout();
 
  // 1. Go to login page
  cy.visit('/login');

diff --git a/cypress/integration/markdown/markdown_spec.js b/cypress/integration/markdown/markdown_spec.js
@@ -33,7 +33,7 @@ const testCases = [
 describe('Markdown message', () => {
  before(() => {
  // 1. Login as "user-1" and go to /
- cy.login('user-1');
+ cy.apiLogin('user-1');
  cy.visit('/');
  });
 

diff --git a/cypress/integration/search/results_post_comment_spec.js b/cypress/integration/search/results_post_comment_spec.js
@@ -12,7 +12,7 @@
 describe('Search', () => {
  it('S14548 Search results Right-Hand-Side: Post a comment', () => {
  // 1. Login and navigate to the app
- cy.login('user-1');
+ cy.apiLogin('user-1');
  cy.visit('/');
 
  const message = `asparagus-${Date.now()}`;

diff --git a/cypress/integration/team/create_a_team_spec.js b/cypress/integration/team/create_a_team_spec.js
@@ -12,7 +12,7 @@ import {getRandomInt} from '../../utils';
 describe('Teams Suite', () => {
  before(() => {
  // 1. Login and go to /
- cy.login('user-1');
+ cy.apiLogin('user-1');
  cy.visit('/');
  });
 

diff --git a/cypress/integration/team/teams_spec.js b/cypress/integration/team/teams_spec.js
@@ -13,7 +13,7 @@ import users from '../../fixtures/users.json';
 describe('Teams Suite', () => {
  it('TS12995 Cancel out of leaving a team', () => {
  // 1. Login and go to /
- cy.login('user-1');
+ cy.apiLogin('user-1');
  cy.visit('/');
 
  // * check the team name
@@ -56,7 +56,7 @@ describe('Teams Suite', () => {
  const offTopicURL = `/${teamURL}/channels/off-topic`;
 
  // 1. Login as System Admin
- cy.login('sysadmin');
+ cy.apiLogin('sysadmin');
  cy.visit('/');
 
  // 2. Create team
@@ -93,7 +93,7 @@ describe('Teams Suite', () => {
  cy.logout();
 
  // 8. Login as user added to Team
- cy.login(user.username);
+ cy.apiLogin(user.username);
 
  // * The added user sees the new team added to the team sidebar
  cy.get(`#${teamURL}TeamButton`).should('have.attr', 'href').should('contain', teamURL);