Skip to content

Commit c2f8384

Browse files
luizrrodriguesluizrrodrigues
authored
Merge branch 'develop' into fix/hide-developer-marathon-match-subtrack
2 parents cbaf9c5 + fe83432 commit c2f8384

File tree

37 files changed

+836
-52
lines changed

37 files changed

+836
-52
lines changed

‎.circleci/config.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ jobs:
248248
source buildenvvar
249249
./automated-smoke-test/smoketest.sh automation-config-staging.json prod
250250
- store_artifacts:
251-
path: /automated-smoke-test/test-results
251+
path: ./automated-smoke-test/test-results
252252

253253
# Automated Smoke Testing against Production
254254
Smoke-Testing-On-Production:
@@ -273,6 +273,8 @@ jobs:
273273
source awsenvconf
274274
source buildenvvar
275275
./automated-smoke-test/smoketest.sh automation-config-prod.json prod
276+
- store_artifacts:
277+
path: ./automated-smoke-test/test-results
276278

277279
# Test job for the cases when we do not need deployment. It just rapidly
278280
# installs (updates) app dependencies, and runs tests (ESLint, Stylelint,
@@ -354,21 +356,22 @@ workflows:
354356
filters:
355357
branches:
356358
only:
357-
- free
359+
- new-leaderboards-theme
358360
# This is beta env for production soft releases
359361
- "build-prod-beta":
360362
context : org-global
361363
filters:
362364
branches:
363365
only:
364-
- fix/hide-developer-marathon-match-subtrack
366+
- free
365367
# This is stage env for production QA releases
366368
- "build-prod-staging":
367369
context : org-global
368370
filters: &filters-staging
369371
branches:
370372
only:
371-
- develop
373+
- develop
374+
- tc-api-issue
372375
# Production builds are exectuted
373376
# when PR is merged to the master
374377
# Don't change anything in this configuration

‎__tests__/shared/components/Leaderboard/__snapshots__/PodiumSpot.jsx.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ exports[`Matches shallow shapshot 1`] = `
3030
style={null}
3131
>
3232
<div
33-
className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__stats___1iYej"
33+
className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__stats-count___XuYEf"
3434
>
3535
<span
3636
className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__value___2shA5"
@@ -89,7 +89,7 @@ exports[`Matches shallow shapshot 2`] = `
8989
style={null}
9090
>
9191
<div
92-
className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__stats___1iYej"
92+
className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__stats-count___XuYEf"
9393
>
9494
<span
9595
className="src-shared-components-Leaderboard-PodiumSpot-themes-___styles__value___2shA5"

‎automated-smoke-test/conf.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ exports.config = {
3434
framework: 'jasmine2',
3535

3636
specs: [
37-
// '../temp/test-suites/tc-login.spec.js'
37+
'../temp/test-suites/tc-login.spec.js',
3838
// '../temp/test-suites/tc-tools.spec.js',
3939
// '../temp/test-suites/tc-account.spec.js',
4040
// '../temp/test-suites/tc-profile.spec.js',
@@ -44,7 +44,7 @@ exports.config = {
4444
'../temp/test-suites/tc-challenge-listing.spec.js',
4545
'../temp/test-suites/tc-challenge-detail.spec.js',
4646
// '../temp/test-suites/tc-my-dashboard.spec.js',
47-
// '../temp/test-suites/tc-member-profile.spec.js',
47+
'../temp/test-suites/tc-member-profile.spec.js',
4848
],
4949

5050
// Options to be passed to Jasmine.

‎automated-smoke-test/config/automation-config-beta.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,18 +152,18 @@
152152
"numberOfSubtracks": 11,
153153
"winInfo": {
154154
"name": "WEB DESIGNS",
155-
"info": "258",
155+
"info": "268",
156156
"infoTitle": "WINS",
157157
"link": "https://beta-community-app.topcoder.com/members/iamtong/details/?track=DESIGN&subTrack=WEB_DESIGNS"
158158
}
159159
},
160160
"developmentProfile": {
161161
"handle": "iamtong",
162162
"trackName": "DEVELOP",
163-
"numberOfSubtracks": 8,
163+
"numberOfSubtracks": 7,
164164
"winInfo": {
165165
"name": "FIRST2FINISH",
166-
"info": "56",
166+
"info": "61",
167167
"infoTitle": "WINS",
168168
"link": "https://beta-community-app.topcoder.com/members/iamtong/details/?track=DEVELOP&subTrack=FIRST_2_FINISH"
169169
}

‎automated-smoke-test/config/automation-config-prod.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,18 +148,18 @@
148148
"numberOfSubtracks": 11,
149149
"winInfo": {
150150
"name": "WEB DESIGNS",
151-
"info": "258",
151+
"info": "268",
152152
"infoTitle": "WINS",
153153
"link": "https://www.topcoder.com/members/iamtong/details/?track=DESIGN&subTrack=WEB_DESIGNS"
154154
}
155155
},
156156
"developmentProfile": {
157157
"handle": "iamtong",
158158
"trackName": "DEVELOP",
159-
"numberOfSubtracks": 8,
159+
"numberOfSubtracks": 7,
160160
"winInfo": {
161161
"name": "FIRST2FINISH",
162-
"info": "56",
162+
"info": "61",
163163
"infoTitle": "WINS",
164164
"link": "https://www.topcoder.com/members/iamtong/details/?track=DEVELOP&subTrack=FIRST_2_FINISH"
165165
}

‎automated-smoke-test/config/automation-config-staging.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,18 +153,18 @@
153153
"numberOfSubtracks": 11,
154154
"winInfo": {
155155
"name": "WEB DESIGNS",
156-
"info": "258",
156+
"info": "268",
157157
"infoTitle": "WINS",
158158
"link": "https://staging-community-app.topcoder.com/members/iamtong/details/?track=DESIGN&subTrack=WEB_DESIGNS"
159159
}
160160
},
161161
"developmentProfile": {
162162
"handle": "iamtong",
163163
"trackName": "DEVELOP",
164-
"numberOfSubtracks": 8,
164+
"numberOfSubtracks": 7,
165165
"winInfo": {
166166
"name": "FIRST2FINISH",
167-
"info": "56",
167+
"info": "61",
168168
"infoTitle": "WINS",
169169
"link": "https://staging-community-app.topcoder.com/members/iamtong/details/?track=DEVELOP&subTrack=FIRST_2_FINISH"
170170
}

‎automated-smoke-test/page-objects/pages/topcoder/login/login.constants.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ export class LoginPageConstants {
55
static get errors() {
66
return {
77
InvalidPassword:
8-
'That password is incorrect. Please check that you entered the right one.',
8+
'WRONG USERNAME OR PASSWORD.',
99
MemberNotPresent:
10-
"We couldn't find a member with that username. Please check that you entered it correctly.",
10+
"WRONG USERNAME OR PASSWORD.",
1111
};
1212
}
1313
}

‎automated-smoke-test/page-objects/pages/topcoder/login/login.helper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export class LoginPageHelper {
4848
* @param {String} password
4949
*/
5050
public static async verifyLogin(username: string, password: string) {
51-
await CommonHelper.verifyCurrentUrl(ConfigHelper.getLoginUrl());
51+
await CommonHelper.verifyCurrentUrlToContain(ConfigHelper.getLoginUrl());
5252
await this.loginPageObject.waitForLoginForm();
5353
await this.loginPageObject.fillLoginForm(username, password);
5454
const homePage = await this.loginPageObject.waitForHomePage();

‎automated-smoke-test/page-objects/pages/topcoder/login/login.po.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export class LoginPage {
4848
* Get Error message
4949
*/
5050
public get errorMessage() {
51-
return ElementHelper.getElementByClassName('form-error');
51+
return ElementHelper.getElementByCss('.auth0-global-message.auth0-global-message-error .animated.fadeInUp span');
5252
}
5353

5454
/**

‎automated-smoke-test/smoketest.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@ track_error $? "Environment setting"
2323
cp ${APPCONFIGFILENAME} config/config.json
2424

2525
docker build -t comm-smoke:latest .
26-
docker run --shm-size=2g comm-smoke:latest ./testrun.sh -d -p 4444:4444
26+
docker run --name comm-smoke --shm-size=2g comm-smoke:latest ./testrun.sh -d -p 4444:4444
27+
docker cp comm-smoke:./automated-smoke-test/test-results .
2728
track_error $? "Test case Failed"

‎automated-smoke-test/test-suites/tc-login.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ describe('Topcoder Login Page Tests: ', () => {
3232
* Verifies User cannot login using invalid username
3333
*/
3434
it('[TC_002] should Verify User cannot login using invalid username', async () => {
35-
const invalidUsername = testData.login.invalidUsername;
35+
const { invalidUsername } = testData.login;
3636
const password = ConfigHelper.getPassword();
3737
await LoginPageHelper.verifyLoginWithInvalidUserName(
3838
invalidUsername,
39-
password
39+
password,
4040
);
4141
});
4242

@@ -45,10 +45,10 @@ describe('Topcoder Login Page Tests: ', () => {
4545
*/
4646
it('[TC_003] should Verify User cannot login using invalid password', async () => {
4747
const username = ConfigHelper.getUserName();
48-
const inavlidPassword = testData.login.invalidPassword;
48+
const { invalidPassword } = testData.login;
4949
await LoginPageHelper.verifyLoginWithInvalidPassword(
5050
username,
51-
inavlidPassword
51+
invalidPassword,
5252
);
5353
});
5454

‎config/default.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ module.exports = {
256256
AUTH_SECRET: 'mysecret',
257257
VALID_ISSUERS: '["https://api.topcoder-dev.com", "https://api.topcoder.com", "https://topcoder-dev.auth0.com/", "https://auth.topcoder-dev.com/","https://topcoder.auth0.com/","https://auth.topcoder.com/"]',
258258
},
259+
CHAMELEON_VERIFICATION_SECRET: 'mysecret',
259260
},
260261
GROWSURF_CAMPAIGN_ID: '',
261262
GROWSURF_COOKIE: '_tc_gigs_ref',

‎package-lock.json

Lines changed: 104 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@
8888
"money": "^0.2.0",
8989
"morgan": "^1.9.0",
9090
"multer": "^1.4.2",
91-
"navigation-component": "topcoder-platform/navigation-component#develop",
91+
"navigation-component": "github:topcoder-platform/navigation-component#develop",
92+
"navigation-component-tco": "github:topcoder-platform/navigation-component-tco#new-dev",
9293
"node-forge": "^0.7.5",
9394
"nuka-carousel": "^4.5.3",
9495
"postcss": "^6.0.23",

‎src/shared/components/Contentful/ContentSlider/ContentSlider.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ ContentSlider.defaultProps = {
101101
cellSpacing: null,
102102
cellAlign: 'center',
103103
wrapAround: true,
104-
heightMode: 'current',
104+
heightMode: 'max',
105105
arrowTheme: 'Gray',
106106
};
107107

‎src/shared/components/Contentful/Menu/index.jsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,12 @@ export default function ContentfulMenu(props) {
244244
render={(menuData) => {
245245
const { fields } = Object.values(menuData.entries.items)[0];
246246
if (!fields) return null;
247-
if (fields.theme === 'General - light' || fields.theme === 'General - dark') {
247+
if (
248+
fields.theme === 'General - light'
249+
|| fields.theme === 'General - dark'
250+
|| fields.theme === 'TCO22 - dark'
251+
|| fields.theme === 'TCO22 - light'
252+
) {
248253
// New navi style menu
249254
// we deligate to special custom component and lib
250255
return (

0 commit comments

Comments
 (0)