From 57b89cd15f50e04cb201d36adfe00109e96c9b94 Mon Sep 17 00:00:00 2001
From: "Luiz R. Rodrigues" <contato@luizrrodrigues.com.br>
Date: Fri, 11 Jun 2021 12:04:01 -0300
Subject: [PATCH 1/2] AST - Challenge Listing - Added filter to search by
 Keyword

---
 .../challenge-listing.helper.ts               | 69 ++++++++++++++++++-
 1 file changed, 66 insertions(+), 3 deletions(-)

diff --git a/automated-smoke-test/page-objects/pages/topcoder/challenge-listing/challenge-listing.helper.ts b/automated-smoke-test/page-objects/pages/topcoder/challenge-listing/challenge-listing.helper.ts
index 29fa9578a3..3f6b1015f2 100644
--- a/automated-smoke-test/page-objects/pages/topcoder/challenge-listing/challenge-listing.helper.ts
+++ b/automated-smoke-test/page-objects/pages/topcoder/challenge-listing/challenge-listing.helper.ts
@@ -72,9 +72,12 @@ export class ChallengeListingPageHelper {
     await BrowserHelper.sleep(5000);
 
     const firstChallenge = ChallengeListingPageObject.firstChallengeLink;
-    let firstChallengeName = '';
-    if (await firstChallenge.isPresent()) {
-      firstChallengeName = await firstChallenge.getText();
+
+    const isPresent = await firstChallenge.isPresent();
+    expect(isPresent).toEqual(true);
+
+    if (isPresent) {
+      const firstChallengeName = await firstChallenge.getText();
       expect(firstChallengeName).toEqual(searchString);
     }
   }
@@ -218,6 +221,35 @@ export class ChallengeListingPageHelper {
     let filtersVisibility = await CommonHelper.isDisplayed(ChallengeListingPageObject.subCommunityLabel);
     expect(filtersVisibility).toBe(true);
 
+    // Filter by Development Challenges
+    let el = await ChallengeListingPageObject.designSwitch();
+    await el.click();
+    await CommonHelper.waitUntilPresenceOf(
+      () => ChallengeListingPageObject.designSwitchTurnedOff,
+      'wait for design switch turn off',
+      false
+    );
+
+    el = await ChallengeListingPageObject.dataScienceSwitch();
+    await el.click();
+    await CommonHelper.waitUntilPresenceOf(
+      () => ChallengeListingPageObject.dataScienceSwitchTurnedOff,
+      'wait for data science switch turn off',
+      false
+    );
+
+    el = await ChallengeListingPageObject.qaSwitch();
+    await el.click();
+    await CommonHelper.waitUntilPresenceOf(
+      () => ChallengeListingPageObject.qaSwitchTurnedOff,
+      'wait for qa switch turn off',
+      false
+    );
+
+    // Filter by Challenge type
+    await ChallengeListingPageObject.first2FinishCheckbox.click();
+    await ChallengeListingPageObject.taskCheckbox.click();
+
     await ChallengeListingPageObject.challengeSearchBox.sendKeys('ReactJS');
     await BrowserHelper.sleep(5000);
     await this.verifyChallengesMatchingKeyword(['ReactJS']);
@@ -505,6 +537,7 @@ export class ChallengeListingPageHelper {
     // const tagText = ConfigHelper.getChallengeDetail().challengeTag;
     const tagText = 'EdgeNet';
     await this.waitForSubCommunity();
+
     await ChallengeListingPageObject.challengeSearchBox.sendKeys(tagText);
     await BrowserHelper.sleep(2000);
 
@@ -514,6 +547,36 @@ export class ChallengeListingPageHelper {
       false
     );
     await ChallengeListingPageObject.getChallengeTag(tagText).click();
+
+    // Filter by Development Challenges
+    let el = await ChallengeListingPageObject.designSwitch();
+    await el.click();
+    await CommonHelper.waitUntilPresenceOf(
+      () => ChallengeListingPageObject.designSwitchTurnedOff,
+      'wait for design switch turn off',
+      false
+    );
+
+    el = await ChallengeListingPageObject.dataScienceSwitch();
+    await el.click();
+    await CommonHelper.waitUntilPresenceOf(
+      () => ChallengeListingPageObject.dataScienceSwitchTurnedOff,
+      'wait for data science switch turn off',
+      false
+    );
+
+    el = await ChallengeListingPageObject.qaSwitch();
+    await el.click();
+    await CommonHelper.waitUntilPresenceOf(
+      () => ChallengeListingPageObject.qaSwitchTurnedOff,
+      'wait for qa switch turn off',
+      false
+    );
+
+    // Filter by Challenge type
+    await ChallengeListingPageObject.first2FinishCheckbox.click();
+    await ChallengeListingPageObject.taskCheckbox.click();
+
     // waiting for re-render to happen
     await BrowserHelper.sleep(15000);
 

From e060656f5ae1078414249e4afb6f1405f5da8159 Mon Sep 17 00:00:00 2001
From: "Luiz R. Rodrigues" <contato@luizrrodrigues.com.br>
Date: Fri, 11 Jun 2021 12:21:32 -0300
Subject: [PATCH 2/2] ci: Deploy ast-challenge-listing-fix to Stag and Dev env

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 968598bb1c..7295c895a4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -341,6 +341,7 @@ workflows:
             branches:
               only:
                 - develop
+                - ast-challenge-listing-fix
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
@@ -369,6 +370,7 @@ workflows:
             branches:
               only:
                 - develop
+                - ast-challenge-listing-fix
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration