Skip to content

Release v1.10.3 #5626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Jul 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ jobs:
source buildenvvar
./automated-smoke-test/smoketest.sh automation-config-staging.json prod
- store_artifacts:
path: /automated-smoke-test/test-results
path: ./automated-smoke-test/test-results

# Automated Smoke Testing against Production
Smoke-Testing-On-Production:
Expand All @@ -273,6 +273,8 @@ jobs:
source awsenvconf
source buildenvvar
./automated-smoke-test/smoketest.sh automation-config-prod.json prod
- store_artifacts:
path: ./automated-smoke-test/test-results

# Test job for the cases when we do not need deployment. It just rapidly
# installs (updates) app dependencies, and runs tests (ESLint, Stylelint,
Expand Down Expand Up @@ -362,14 +364,15 @@ workflows:
filters:
branches:
only:
- free
- new-tabs-theme
# This is stage env for production QA releases
- "build-prod-staging":
context : org-global
filters: &filters-staging
branches:
only:
- develop
- develop
- ast-member-profile
# Production builds are exectuted
# when PR is merged to the master
# Don't change anything in this configuration
Expand Down
4 changes: 2 additions & 2 deletions automated-smoke-test/conf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ exports.config = {
framework: 'jasmine2',

specs: [
// '../temp/test-suites/tc-login.spec.js'
'../temp/test-suites/tc-login.spec.js',
// '../temp/test-suites/tc-tools.spec.js',
// '../temp/test-suites/tc-account.spec.js',
// '../temp/test-suites/tc-profile.spec.js',
Expand All @@ -44,7 +44,7 @@ exports.config = {
'../temp/test-suites/tc-challenge-listing.spec.js',
'../temp/test-suites/tc-challenge-detail.spec.js',
// '../temp/test-suites/tc-my-dashboard.spec.js',
// '../temp/test-suites/tc-member-profile.spec.js',
'../temp/test-suites/tc-member-profile.spec.js',
],

// Options to be passed to Jasmine.
Expand Down
6 changes: 3 additions & 3 deletions automated-smoke-test/config/automation-config-beta.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,18 +152,18 @@
"numberOfSubtracks": 11,
"winInfo": {
"name": "WEB DESIGNS",
"info": "258",
"info": "268",
"infoTitle": "WINS",
"link": "https://beta-community-app.topcoder.com/members/iamtong/details/?track=DESIGN&subTrack=WEB_DESIGNS"
}
},
"developmentProfile": {
"handle": "iamtong",
"trackName": "DEVELOP",
"numberOfSubtracks": 8,
"numberOfSubtracks": 7,
"winInfo": {
"name": "FIRST2FINISH",
"info": "56",
"info": "61",
"infoTitle": "WINS",
"link": "https://beta-community-app.topcoder.com/members/iamtong/details/?track=DEVELOP&subTrack=FIRST_2_FINISH"
}
Expand Down
6 changes: 3 additions & 3 deletions automated-smoke-test/config/automation-config-prod.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,18 +148,18 @@
"numberOfSubtracks": 11,
"winInfo": {
"name": "WEB DESIGNS",
"info": "258",
"info": "268",
"infoTitle": "WINS",
"link": "https://www.topcoder.com/members/iamtong/details/?track=DESIGN&subTrack=WEB_DESIGNS"
}
},
"developmentProfile": {
"handle": "iamtong",
"trackName": "DEVELOP",
"numberOfSubtracks": 8,
"numberOfSubtracks": 7,
"winInfo": {
"name": "FIRST2FINISH",
"info": "56",
"info": "61",
"infoTitle": "WINS",
"link": "https://www.topcoder.com/members/iamtong/details/?track=DEVELOP&subTrack=FIRST_2_FINISH"
}
Expand Down
6 changes: 3 additions & 3 deletions automated-smoke-test/config/automation-config-staging.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,18 +153,18 @@
"numberOfSubtracks": 11,
"winInfo": {
"name": "WEB DESIGNS",
"info": "258",
"info": "268",
"infoTitle": "WINS",
"link": "https://staging-community-app.topcoder.com/members/iamtong/details/?track=DESIGN&subTrack=WEB_DESIGNS"
}
},
"developmentProfile": {
"handle": "iamtong",
"trackName": "DEVELOP",
"numberOfSubtracks": 8,
"numberOfSubtracks": 7,
"winInfo": {
"name": "FIRST2FINISH",
"info": "56",
"info": "61",
"infoTitle": "WINS",
"link": "https://staging-community-app.topcoder.com/members/iamtong/details/?track=DEVELOP&subTrack=FIRST_2_FINISH"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ export class LoginPageConstants {
static get errors() {
return {
InvalidPassword:
'That password is incorrect. Please check that you entered the right one.',
'WRONG USERNAME OR PASSWORD.',
MemberNotPresent:
"We couldn't find a member with that username. Please check that you entered it correctly.",
"WRONG USERNAME OR PASSWORD.",
};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export class LoginPageHelper {
* @param {String} password
*/
public static async verifyLogin(username: string, password: string) {
await CommonHelper.verifyCurrentUrl(ConfigHelper.getLoginUrl());
await CommonHelper.verifyCurrentUrlToContain(ConfigHelper.getLoginUrl());
await this.loginPageObject.waitForLoginForm();
await this.loginPageObject.fillLoginForm(username, password);
const homePage = await this.loginPageObject.waitForHomePage();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export class LoginPage {
* Get Error message
*/
public get errorMessage() {
return ElementHelper.getElementByClassName('form-error');
return ElementHelper.getElementByCss('.auth0-global-message.auth0-global-message-error .animated.fadeInUp span');
}

/**
Expand Down
8 changes: 4 additions & 4 deletions automated-smoke-test/test-suites/tc-login.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ describe('Topcoder Login Page Tests: ', () => {
* Verifies User cannot login using invalid username
*/
it('[TC_002] should Verify User cannot login using invalid username', async () => {
const invalidUsername = testData.login.invalidUsername;
const { invalidUsername } = testData.login;
const password = ConfigHelper.getPassword();
await LoginPageHelper.verifyLoginWithInvalidUserName(
invalidUsername,
password
password,
);
});

Expand All @@ -45,10 +45,10 @@ describe('Topcoder Login Page Tests: ', () => {
*/
it('[TC_003] should Verify User cannot login using invalid password', async () => {
const username = ConfigHelper.getUserName();
const inavlidPassword = testData.login.invalidPassword;
const { invalidPassword } = testData.login;
await LoginPageHelper.verifyLoginWithInvalidPassword(
username,
inavlidPassword
invalidPassword,
);
});

Expand Down
39 changes: 36 additions & 3 deletions src/shared/components/Contentful/Tabs/Tabs.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import underlineTheme from './themes/underline.scss';
import underlineDarkTheme from './themes/underline-dark.scss';
import verticalTheme from './themes/vertical.scss';
import pillsTheme from './themes/pills.scss';
import underlineBoxTheme from './themes/underline-box.scss';

export const TAB_THEMES = {
Default: defaultTheme,
Expand All @@ -36,13 +37,15 @@ export const TAB_THEMES = {
'Underline dark': underlineDarkTheme,
Vertical: verticalTheme,
Pills: pillsTheme,
'Underline box': underlineBoxTheme,
};

export default class TabsItemsLoader extends Component {
constructor(props) {
super(props);
this.state = {
tabIndex: props.selected || 0,
mobileTabsShow: false,
};

this.updatePageUrl.bind(this);
Expand Down Expand Up @@ -83,8 +86,9 @@ export default class TabsItemsLoader extends Component {
environment,
theme,
tabId,
themeName,
} = this.props;
const { tabIndex } = this.state;
const { tabIndex, mobileTabsShow } = this.state;

return (
<ContentfulLoader
Expand All @@ -97,11 +101,39 @@ export default class TabsItemsLoader extends Component {
className={theme.container}
selectedIndex={tabIndex}
selectedTabClassName={theme.selected}
onSelect={tIndx => this.setState({ tabIndex: tIndx })}
onSelect={tIndx => this.setState({ tabIndex: tIndx, mobileTabsShow: false })}
forceRenderTabPanel
>
<div className={theme.tabListWrap}>
<TabList className={theme.tablist}>
{
themeName === 'Underline box' ? (
<button type="button" className={theme.tabListMobileTrigger} onClick={() => this.setState({ mobileTabsShow: !mobileTabsShow })}>
<MarkdownRenderer
markdown={_.toArray(data.entries.items)[tabIndex].fields.tab}
/>
<svg className={mobileTabsShow ? theme.tabListMobileTriggerSVGOpen : theme.tabListMobileTriggerSVG} width="16px" height="10px" viewBox="0 0 16 10" version="1.1" xmlns="http://www.w3.org/2000/svg">
<defs>
<polygon id="path-1" points="7.7 9.2 0 1.5 1.4 0 7.7 6.3 14 0 15.4 1.5" />
</defs>
<g id="Mobile" stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
<g id="01" transform="translate(-228.000000, -315.000000)">
<g id="Group-6" transform="translate(16.000000, 289.000000)">
<g id="Group-4" transform="translate(126.000000, 21.000000)">
<g id="icons/arrow/minimal-down" transform="translate(86.300000, 5.400000)">
<mask id="mask-2" fill="white">
<use xlinkHref="#path-1" />
</mask>
<use id="icon-color" fill="#2A2A2A" xlinkHref="#path-1" />
</g>
</g>
</g>
</g>
</g>
</svg>
</button>
) : null
}
<TabList className={[theme.tablist, mobileTabsShow ? theme.visible : null]}>
{
_.map(data.entries.items, tabItem => (
<Tab
Expand Down Expand Up @@ -208,4 +240,5 @@ TabsItemsLoader.propTypes = {
selected: PT.number,
theme: PT.shape().isRequired,
tabId: PT.string.isRequired,
themeName: PT.string.isRequired,
};
1 change: 1 addition & 0 deletions src/shared/components/Contentful/Tabs/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ function ContentfulTabs(props) {
selected={fields.selected}
theme={TAB_THEMES[fields.theme || 'Default']}
tabId={fields.urlQueryName || id}
themeName={fields.theme}
/>
);
}}
Expand Down
Loading