Skip to content

Commit d3ff029

Browse files
luizrrodriguesluizrrodrigues
authored
Merge branch 'develop' into feature/profile-add-edgenet
2 parents 05192bf + 16ade0c commit d3ff029

File tree

20 files changed

+114
-43
lines changed

20 files changed

+114
-43
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,6 @@ workflows:
341341
branches:
342342
only:
343343
- develop
344-
- topgear-app
345344
# This is alternate dev env for parallel testing
346345
- "build-test":
347346
context : org-global
@@ -370,7 +369,6 @@ workflows:
370369
branches:
371370
only:
372371
- develop
373-
- feature/profile-add-edgenet
374372
# Production builds are exectuted
375373
# when PR is merged to the master
376374
# Don't change anything in this configuration
@@ -392,9 +390,7 @@ workflows:
392390
- develop
393391

394392
Smoke Testing:
395-
when:
396-
and:
397-
- << pipeline.parameters.run_smoketesting >>
393+
when: << pipeline.parameters.run_smoketesting >>
398394
jobs:
399395
- Hold [Smoke-Testing]:
400396
type: approval

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@
103103
"termUrl": "https://beta-community-app.topcoder.com/challenges/terms/detail/9ef9dec4-dddb-48c9-9cce-659db68bc5ac",
104104
"forumUrl": "https://apps.topcoder.com/forums/?module=Category&categoryID=82117",
105105
"submissionUrl": "https://beta-community-app.topcoder.com/challenges/4bd5cf15-41ee-4932-927d-fda5731ec023/submit",
106-
"scorecardUrl": "https://software.topcoder.com/review/actions/ViewScorecard?scid=30002133"
106+
"scorecardUrl": "https://software.topcoder.com/review/actions/ViewScorecard?scid=30002133",
107+
"searchText": "KGuTnJmJ"
107108
},
108109
"myDashboard": {
109110
"url": "https://beta-community-app.topcoder.com/my-dashboard",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@
104104
"termUrl": "https://community-app.topcoder-dev.com/challenges/terms/detail/b11da5cd-713f-478d-90f4-f679ef53ee95",
105105
"forumUrl": "https://apps.topcoder-dev.com/forums/?module=Category&categoryID=0",
106106
"submissionUrl": "https://community-app.topcoder-dev.com/challenges/e0db3e96-522e-4b56-b954-a514acfd536e/submit",
107-
"scorecardUrl": "https://software.topcoder-dev.com/review/actions/ViewScorecard?scid=30056744"
107+
"scorecardUrl": "https://software.topcoder-dev.com/review/actions/ViewScorecard?scid=30056744",
108+
"searchText": "KGuTnJmJ"
108109
},
109110
"myDashboard": {
110111
"url": "https://community-app.topcoder-dev.com/my-dashboard",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@
9999
"termUrl": "http://localhost:3000/challenges/terms/detail/9ef9dec4-dddb-48c9-9cce-659db68bc5ac",
100100
"forumUrl": "https://apps.topcoder.com/forums/?module=Category&categoryID=82117",
101101
"submissionUrl": "http://localhost:3000/challenges/4bd5cf15-41ee-4932-927d-fda5731ec023/submit",
102-
"scorecardUrl": "https://software.topcoder.com/review/actions/ViewScorecard?scid=30002133"
102+
"scorecardUrl": "https://software.topcoder.com/review/actions/ViewScorecard?scid=30002133",
103+
"searchText": "KGuTnJmJ"
103104
},
104105
"myDashboard": {
105106
"url": "http://localhost:3000/my-dashboard",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@
9999
"termUrl": "https://www.topcoder.com/challenges/terms/detail/9ef9dec4-dddb-48c9-9cce-659db68bc5ac",
100100
"forumUrl": "https://apps.topcoder.com/forums/?module=Category&categoryID=82117",
101101
"submissionUrl": "https://www.topcoder.com/challenges/4bd5cf15-41ee-4932-927d-fda5731ec023/submit",
102-
"scorecardUrl": "https://software.topcoder.com/review/actions/ViewScorecard?scid=30002133"
102+
"scorecardUrl": "https://software.topcoder.com/review/actions/ViewScorecard?scid=30002133",
103+
"searchText": "KGuTnJmJ"
103104
},
104105
"myDashboard": {
105106
"url": "https://www.topcoder.com/my-dashboard",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@
104104
"termUrl": "https://qa-community-app.topcoder-dev.com/challenges/terms/detail/b11da5cd-713f-478d-90f4-f679ef53ee95",
105105
"forumUrl": "https://apps.topcoder-dev.com/forums/?module=Category&categoryID=0",
106106
"submissionUrl": "https://qa-community-app.topcoder-dev.com/challenges/ee951f3e-8c3d-41d7-b232-aa8774ff7f27/submit",
107-
"scorecardUrl": "https://software.topcoder-dev.com/review/actions/ViewScorecard?scid=30001610"
107+
"scorecardUrl": "https://software.topcoder-dev.com/review/actions/ViewScorecard?scid=30001610",
108+
"searchText": "KGuTnJmJ"
108109
},
109110
"myDashboard": {
110111
"url": "https://qa-community-app.topcoder-dev.com/my-dashboard",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@
104104
"termUrl": "https://staging-community-app.topcoder.com/challenges/terms/detail/9ef9dec4-dddb-48c9-9cce-659db68bc5ac",
105105
"forumUrl": "https://apps.topcoder.com/forums/?module=Category&categoryID=82117",
106106
"submissionUrl": "https://staging-community-app.topcoder.com/challenges/4bd5cf15-41ee-4932-927d-fda5731ec023/submit",
107-
"scorecardUrl": "https://software.topcoder.com/review/actions/ViewScorecard?scid=30002133"
107+
"scorecardUrl": "https://software.topcoder.com/review/actions/ViewScorecard?scid=30002133",
108+
"searchText": "KGuTnJmJ"
108109
},
109110
"myDashboard": {
110111
"url": "https://staging-community-app.topcoder.com/my-dashboard",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@
104104
"termUrl": "https://test-community-app.topcoder-dev.com/challenges/terms/detail/b11da5cd-713f-478d-90f4-f679ef53ee95",
105105
"forumUrl": "https://apps.topcoder-dev.com/forums/?module=Category&categoryID=0",
106106
"submissionUrl": "https://test-community-app.topcoder-dev.com/challenges/ee951f3e-8c3d-41d7-b232-aa8774ff7f27/submit",
107-
"scorecardUrl": "https://software.topcoder-dev.com/review/actions/ViewScorecard?scid=30001610"
107+
"scorecardUrl": "https://software.topcoder-dev.com/review/actions/ViewScorecard?scid=30001610",
108+
"searchText": "KGuTnJmJ"
108109
},
109110
"myDashboard": {
110111
"url": "https://test-community-app.topcoder-dev.com/my-dashboard",

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

Lines changed: 68 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,17 @@ export class ChallengeListingPageHelper {
6767
false
6868
);
6969

70-
const searchString = ConfigHelper.getChallengeDetail().challengeName;
70+
const searchString = ConfigHelper.getChallengeDetail().searchText;
7171
await ChallengeListingPageObject.challengeSearchBox.sendKeys(searchString);
7272
await BrowserHelper.sleep(5000);
7373

7474
const firstChallenge = ChallengeListingPageObject.firstChallengeLink;
75-
let firstChallengeName = '';
76-
if (await firstChallenge.isPresent()) {
77-
firstChallengeName = await firstChallenge.getText();
75+
76+
const isPresent = await firstChallenge.isPresent();
77+
expect(isPresent).toEqual(true);
78+
79+
if (isPresent) {
80+
const firstChallengeName = await firstChallenge.getText();
7881
expect(firstChallengeName).toEqual(searchString);
7982
}
8083
}
@@ -218,6 +221,35 @@ export class ChallengeListingPageHelper {
218221
let filtersVisibility = await CommonHelper.isDisplayed(ChallengeListingPageObject.subCommunityLabel);
219222
expect(filtersVisibility).toBe(true);
220223

224+
// Filter by Development Challenges
225+
let el = await ChallengeListingPageObject.designSwitch();
226+
await el.click();
227+
await CommonHelper.waitUntilPresenceOf(
228+
() => ChallengeListingPageObject.designSwitchTurnedOff,
229+
'wait for design switch turn off',
230+
false
231+
);
232+
233+
el = await ChallengeListingPageObject.dataScienceSwitch();
234+
await el.click();
235+
await CommonHelper.waitUntilPresenceOf(
236+
() => ChallengeListingPageObject.dataScienceSwitchTurnedOff,
237+
'wait for data science switch turn off',
238+
false
239+
);
240+
241+
el = await ChallengeListingPageObject.qaSwitch();
242+
await el.click();
243+
await CommonHelper.waitUntilPresenceOf(
244+
() => ChallengeListingPageObject.qaSwitchTurnedOff,
245+
'wait for qa switch turn off',
246+
false
247+
);
248+
249+
// Filter by Challenge type
250+
await ChallengeListingPageObject.first2FinishCheckbox.click();
251+
await ChallengeListingPageObject.taskCheckbox.click();
252+
221253
await ChallengeListingPageObject.challengeSearchBox.sendKeys('ReactJS');
222254
await BrowserHelper.sleep(5000);
223255
await this.verifyChallengesMatchingKeyword(['ReactJS']);
@@ -503,8 +535,9 @@ export class ChallengeListingPageHelper {
503535
*/
504536
static async verifyChallengesByChallengeTag() {
505537
// const tagText = ConfigHelper.getChallengeDetail().challengeTag;
506-
const tagText = 'ReactJS';
538+
const tagText = 'EdgeNet';
507539
await this.waitForSubCommunity();
540+
508541
await ChallengeListingPageObject.challengeSearchBox.sendKeys(tagText);
509542
await BrowserHelper.sleep(2000);
510543

@@ -514,6 +547,36 @@ export class ChallengeListingPageHelper {
514547
false
515548
);
516549
await ChallengeListingPageObject.getChallengeTag(tagText).click();
550+
551+
// Filter by Development Challenges
552+
let el = await ChallengeListingPageObject.designSwitch();
553+
await el.click();
554+
await CommonHelper.waitUntilPresenceOf(
555+
() => ChallengeListingPageObject.designSwitchTurnedOff,
556+
'wait for design switch turn off',
557+
false
558+
);
559+
560+
el = await ChallengeListingPageObject.dataScienceSwitch();
561+
await el.click();
562+
await CommonHelper.waitUntilPresenceOf(
563+
() => ChallengeListingPageObject.dataScienceSwitchTurnedOff,
564+
'wait for data science switch turn off',
565+
false
566+
);
567+
568+
el = await ChallengeListingPageObject.qaSwitch();
569+
await el.click();
570+
await CommonHelper.waitUntilPresenceOf(
571+
() => ChallengeListingPageObject.qaSwitchTurnedOff,
572+
'wait for qa switch turn off',
573+
false
574+
);
575+
576+
// Filter by Challenge type
577+
await ChallengeListingPageObject.first2FinishCheckbox.click();
578+
await ChallengeListingPageObject.taskCheckbox.click();
579+
517580
// waiting for re-render to happen
518581
await BrowserHelper.sleep(15000);
519582

‎automated-smoke-test/utils/config-helper.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export interface ChallengeDetail {
2020
forumUrl: string;
2121
submissionUrl: string;
2222
scorecardUrl: string;
23+
searchText: string,
2324
}
2425

2526
export interface CommunityCardInfo {

0 commit comments

Comments
 (0)