mirror of
https://github.com/hanzoai/team.git
synced 2026-11-01 07:55:31 +00:00
* ci: shard server Postgres tests into 4 parallel runners (#35739) Cherry-pick of00296f9b49from master. * updated go to version 1.25.8 (#35817) Cherry-pick of32a10bac62from master. * Move password hashers from server/v8 to server/public (#35805) Cherry-pick ofcca3f08574from master. * Generate instead of hard-coding test passwords, enforce new minimum for FIPS, shard CI, fix FIPS builds (#35905) Cherry-pick of1bdd985b41from master. * upgrade golangci-lint (#35845) Cherry-pick of157e0400b2from master. On release-11.4 (unlike 11.5), UpdatePostsChannelTypeByChannelId and BackfillPostsChannelType exist in the elasticsearch/opensearch files, so the imports they require (fmt, updatebyquery, scriptlanguage) must be added — they were not in the cherry-pick diff since they already existed on master. Also updates html2text/tablewriter/olekukonko deps to fix a workspace conflict where enterprise's Go 1.25.8 bump pulled in a newer html2text that requires tablewriter ≥ 1.1 (was pinned to 0.0.5 via a replace directive). Matches the subset of866f759e4b(Mm 66662 bump deps) relevant to this incompatibility. * Fix FIPS-incompatible passwords and config in e2e test suites (#36001) Cherry-pick ofb51b4a8937from master. release-11.4 differences vs release-11.5: - demo_plugin_installation.spec.ts also deleted (modify/delete conflict, git rm) - authentication_2_spec.ts conflict: HEAD missing check() call; took incoming (check + FIPS-length passwords) - member_invitation_ui_spec.ts: HEAD has 'Create Account' (capital A) matching release-11.4 button text; kept HEAD's button text with incoming's newTestPassword() * fix(cypress): demo plugin (#36056) Cherry-pick of39f1979aa5from master. demo_plugin_installation.spec.ts was deleted in step 10 (modify/delete); re-created here with both the FIPS-password change and the URL fix. * test: clean up channel store data after TestChannelStore (#36066) TestChannelStore sub-tests create channels, members, and team members using fake TeamIds and UserIds (model.NewId() for non-existent rows). These records are left in the database and cause integrity tests (TestCheck*) running in the same binary to fail their full-table scans. Register a t.Cleanup on TestChannelStore that purges the affected tables entirely. A blanket purge is safe: the schema enforces no FK constraints, and every test suite creates its own data independently. * Fix command injection in server-test-template workflow (#36080) Cherry-pick of9223935f16from master. * fix(ci): restore testname format in sharded gotestsum runs (#36078) run-shard-tests.sh called gotestsum directly without --format, so it fell back to gotestsum's default (pkgname) instead of the testname format set by the Makefile. Pass --format "${GOTESTSUM_FORMAT:-testname}" to match the Makefile default. Co-authored-by: Mattermost Build <[email protected]> * fixup: drop demo_plugin playwright specs — master-only APIs demo_plugin/helpers.ts and demo_plugin_installation.spec.ts use installAndEnablePlugin and isPluginActive which don't exist on release-11.4's PlaywrightExtended type. These files were re-created by the step-11 cherry-pick of39f1979aa5, but they don't compile on this branch (same class of problem as actions.spec.ts in step 10). * fixup: add missing await in PluginLinkTooltip test The test added in39f1979aa5is missing an await on renderWithContext, causing the pointer-events assertion to race. Fix from 0c7d3f27c6 (on a feature branch, not yet on master). * fixup: drop pointer-events test incompatible with jsdom@20 The 'should not block interaction with elements outside the tooltip' test checks getComputedStyle for pointer-events: none, which is set only in SCSS. release-11.4 uses jest-environment-jsdom@29 (jsdom@20), which does not apply stylesheets, so getComputedStyle always returns "". The test passes on release-11.5+ only because they use jest-environment-jsdom@30 (jsdom@25+). Drop the test rather than backport the jsdom upgrade. * fixup: add missing i18n keys for elasticsearch/opensearch functions BackfillPostsChannelType and UpdatePostsChannelTypeByChannelId exist on release-11.4 (unlike release-11.5+). The golangci-lint cherry-pick added new error strings to those functions referencing i18n keys that weren't in en.json. * fixup: run make i18n-extract to reorder keys correctly * fixup: drop terms-and-privacy checkbox from MM-T1774 on release-11.4 The #signup-body-card-form-check-terms-and-privacy element did not exist on release-11.4's signup page. It was added to master after this branch was cut, so the check() call from the incoming cherry-pick causes the test to fail with "element never found". * fixup: remove UpdatePostsChannelTypeByChannelId/BackfillPostsChannelType These functions were introduced by MM-67540 (allow searching public channel messages without channel membership), which never landed on release-11.4. The golangci-lint cherry-pick only modernizes existing code; the rerere resolution incorrectly added the full function bodies from master. Remove both functions and their now-unused imports (fmt, updatebyquery, scriptlanguage) from elasticsearch.go and opensearch.go. Also remove the two i18n keys added to support them. Same treatment as release-11.5, where these functions were also absent. --------- Co-authored-by: Mattermost Build <[email protected]>
258 lines
8.0 KiB
TypeScript
258 lines
8.0 KiB
TypeScript
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
import * as TIMEOUTS from '../../../fixtures/timeouts';
|
|
import {getAdminAccount} from '../../../support/env';
|
|
import {newTestPassword} from '../../../utils';
|
|
|
|
export type SimpleUser = Pick<Cypress.UserProfile, 'username' | 'first_name' | 'last_name' | 'nickname' | 'password' | 'email'>;
|
|
|
|
function createPrivateChannel(teamId: string, userToAdd: Cypress.UserProfile = null) {
|
|
// # Create a private channel as sysadmin
|
|
return createChannel('P', teamId, userToAdd);
|
|
}
|
|
|
|
function createPublicChannel(teamId: string, userToAdd: Cypress.UserProfile = null) {
|
|
// # Create a public channel as sysadmin
|
|
return createChannel('O', teamId, userToAdd);
|
|
}
|
|
|
|
function createSearchData(prefix: string) {
|
|
return cy.apiCreateCustomAdmin({loginAfter: true, hideAdminTrialModal: true}).then(({sysadmin}) => {
|
|
const users = getTestUsers(prefix);
|
|
|
|
cy.apiLogin(sysadmin);
|
|
|
|
// # Create new team for tests
|
|
return cy.apiCreateTeam('search', 'Search').then(({team}) => {
|
|
// # Create pool of users for tests
|
|
Cypress._.forEach(users, (testUser) => {
|
|
cy.apiCreateUser({user: testUser}).then(({user}) => {
|
|
cy.apiAddUserToTeam(team.id, user.id);
|
|
});
|
|
});
|
|
|
|
return cy.wrap({sysadmin, team, users});
|
|
});
|
|
});
|
|
}
|
|
|
|
function getTestUsers(prefix = ''): Record<string, SimpleUser> {
|
|
if (Cypress.env('searchTestUsers')) {
|
|
return JSON.parse(Cypress.env('searchTestUsers'));
|
|
}
|
|
|
|
return {
|
|
ironman: generatePrefixedUser({
|
|
username: 'ironman',
|
|
first_name: 'Tony',
|
|
last_name: 'Stark',
|
|
nickname: 'protoncannon',
|
|
}, prefix),
|
|
hulk: generatePrefixedUser({
|
|
username: 'hulk',
|
|
first_name: 'Bruce',
|
|
last_name: 'Banner',
|
|
nickname: 'gammaray',
|
|
}, prefix),
|
|
hawkeye: generatePrefixedUser({
|
|
username: 'hawkeye',
|
|
first_name: 'Clint',
|
|
last_name: 'Barton',
|
|
nickname: 'ronin',
|
|
}, prefix),
|
|
deadpool: generatePrefixedUser({
|
|
username: 'deadpool',
|
|
first_name: 'Wade',
|
|
last_name: 'Wilson',
|
|
nickname: 'merc',
|
|
}, prefix),
|
|
captainamerica: generatePrefixedUser({
|
|
username: 'captainamerica',
|
|
first_name: 'Steve',
|
|
last_name: 'Rogers',
|
|
nickname: 'professional',
|
|
}, prefix),
|
|
doctorstrange: generatePrefixedUser({
|
|
username: 'doctorstrange',
|
|
first_name: 'Stephen',
|
|
last_name: 'Strange',
|
|
nickname: 'sorcerersupreme',
|
|
}, prefix),
|
|
thor: generatePrefixedUser({
|
|
username: 'thor',
|
|
first_name: 'Thor',
|
|
last_name: 'Odinson',
|
|
nickname: 'mjolnir',
|
|
}, prefix),
|
|
loki: generatePrefixedUser({
|
|
username: 'loki',
|
|
first_name: 'Loki',
|
|
last_name: 'Odinson',
|
|
nickname: 'trickster',
|
|
}, prefix),
|
|
dot: generatePrefixedUser({
|
|
username: 'dot.dot',
|
|
first_name: 'z1First',
|
|
last_name: 'z1Last',
|
|
nickname: 'z1Nick',
|
|
}, prefix),
|
|
dash: generatePrefixedUser({
|
|
username: 'dash-dash',
|
|
first_name: 'z2First',
|
|
last_name: 'z2Last',
|
|
nickname: 'z2Nick',
|
|
}, prefix),
|
|
underscore: generatePrefixedUser({
|
|
username: 'under_score',
|
|
first_name: 'z3First',
|
|
last_name: 'z3Last',
|
|
nickname: 'z3Nick',
|
|
}, prefix),
|
|
};
|
|
}
|
|
|
|
function getPostTextboxInput() {
|
|
cy.wait(TIMEOUTS.HALF_SEC);
|
|
cy.uiGetPostTextBox().
|
|
as('input').
|
|
clear();
|
|
}
|
|
|
|
function getQuickChannelSwitcherInput() {
|
|
cy.findByRole('combobox', {name: 'quick switch input'}).
|
|
should('be.visible').
|
|
as('input').
|
|
clear();
|
|
}
|
|
|
|
function searchAndVerifyChannel(channel: Cypress.Channel, shouldExist = true) {
|
|
const name = channel.display_name;
|
|
searchForChannel(name);
|
|
|
|
if (shouldExist) {
|
|
// * Channel should appear in suggestions list
|
|
cy.get('#suggestionList').findByTestId(channel.name).should('be.visible');
|
|
} else {
|
|
// * Suggestion list and channel item should not appear
|
|
cy.get('#suggestionList').should('not.exist');
|
|
cy.findByTestId(channel.name).should('not.exist');
|
|
}
|
|
}
|
|
|
|
function searchAndVerifyUser(user: Cypress.UserProfile) {
|
|
// # Start @ mentions autocomplete with username
|
|
cy.uiGetPostTextBox().
|
|
as('input').
|
|
clear().
|
|
type(`@${user.username}`);
|
|
|
|
// * Suggestion list should appear
|
|
cy.get('#suggestionList', {timeout: TIMEOUTS.FIVE_SEC}).should('be.visible');
|
|
|
|
// * Verify user appears in results post-change
|
|
return cy.uiVerifyAtMentionSuggestion(user);
|
|
}
|
|
|
|
function searchForChannel(name: string) {
|
|
// # Open up channel switcher
|
|
cy.typeCmdOrCtrl().type('k').wait(TIMEOUTS.ONE_SEC);
|
|
|
|
// # Clear out and type in the name
|
|
cy.findByRole('combobox', {name: 'quick switch input'}).
|
|
should('be.visible').
|
|
as('input').
|
|
clear().
|
|
type(name);
|
|
}
|
|
|
|
function startAtMention(string: string) {
|
|
// # Get the expected input
|
|
cy.get('@input').clear().type(string);
|
|
|
|
// * Suggestion list should appear
|
|
cy.get('#suggestionList').should('be.visible');
|
|
}
|
|
|
|
function verifySuggestionAtPostTextbox(...expectedUsers: SimpleUser[]) {
|
|
expectedUsers.forEach((user) => {
|
|
cy.wait(TIMEOUTS.HALF_SEC);
|
|
cy.uiVerifyAtMentionSuggestion(user);
|
|
});
|
|
}
|
|
|
|
function verifySuggestionAtChannelSwitcher(...expectedUsers: SimpleUser[]) {
|
|
expectedUsers.forEach((user) => {
|
|
cy.findByTestId(user.username).
|
|
should('be.visible').
|
|
and('have.text', `${user.first_name} ${user.last_name} (${user.nickname})@${user.username}`);
|
|
});
|
|
}
|
|
|
|
function createChannel(channelType: string, teamId: string, userToAdd: Cypress.UserProfile = null) {
|
|
// # Create a channel as sysadmin
|
|
return cy.externalRequest({
|
|
user: getAdminAccount(),
|
|
method: 'POST',
|
|
path: 'channels',
|
|
data: {
|
|
team_id: teamId,
|
|
name: 'test-channel' + Date.now(),
|
|
display_name: 'Test Channel ' + Date.now(),
|
|
type: channelType,
|
|
header: '',
|
|
purpose: '',
|
|
},
|
|
}).then(({data: channel}) => {
|
|
if (userToAdd) {
|
|
// # Get user profile by email
|
|
return cy.apiGetUserByEmail(userToAdd.email).then(({user}) => {
|
|
// # Add user to channel
|
|
cy.externalAddUserToChannel(user.id, channel.id).then(() => {
|
|
// # Explicitly wait to give some time to index before searching
|
|
cy.wait(TIMEOUTS.TWO_SEC);
|
|
return cy.wrap(channel);
|
|
});
|
|
});
|
|
}
|
|
|
|
// # Explicitly wait to give some time to index before searching
|
|
cy.wait(TIMEOUTS.TWO_SEC);
|
|
return cy.wrap(channel);
|
|
});
|
|
}
|
|
|
|
function generatePrefixedUser(user: Omit<SimpleUser, 'password' | 'email'>, prefix: string) {
|
|
return {
|
|
username: withPrefix(user.username, prefix),
|
|
password: newTestPassword(),
|
|
first_name: withPrefix(user.first_name, prefix),
|
|
last_name: withPrefix(user.last_name, prefix),
|
|
email: createEmail(user.username, prefix),
|
|
nickname: withPrefix(user.nickname, prefix),
|
|
};
|
|
}
|
|
|
|
function withPrefix(name: string, prefix: string) {
|
|
return prefix + name;
|
|
}
|
|
|
|
function createEmail(name: string, prefix: string) {
|
|
return `${prefix}${name}@sample.mattermost.com`;
|
|
}
|
|
|
|
export {
|
|
createPrivateChannel,
|
|
createPublicChannel,
|
|
createSearchData,
|
|
getTestUsers,
|
|
getPostTextboxInput,
|
|
getQuickChannelSwitcherInput,
|
|
searchAndVerifyChannel,
|
|
searchAndVerifyUser,
|
|
searchForChannel,
|
|
startAtMention,
|
|
verifySuggestionAtChannelSwitcher,
|
|
verifySuggestionAtPostTextbox,
|
|
};
|