Merge pull request #5581 from topcoder-platform/develop

Release v1.9.8

Author: luizrrodrigues

.circleci/config.yml

@@ -361,7 +361,7 @@ workflows:
           filters:
             branches:
               only:
-                - thrive-bug-fixes2
+                - free
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global         

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);
 

src/shared/containers/tc-communities/Loader.jsx

@@ -46,21 +46,19 @@ class Loader extends React.Component {
       !meta /* || (Date.now() - meta.timestamp) > MAXAGE */
     )) nextProps.loadMetaData(communityId, tokenV3);
 
-    /* TODO: This is a hacky way to handle SSO authentication for TopGear
-     * (Wipro) and Zurich community visitors. Should be re-factored, but not it is not
-     * clear, what exactly do we need to support it in general. */
-    if ((communityId === 'wipro' || communityId === 'comcast') && !visitorGroups) {
+    /* TODO: This is a hacky way to handle SSO authentication for TopGear */
+    if (communityId === 'comcast' && !visitorGroups) {
       const returnUrl = encodeURIComponent(window.location.href);
-      if (communityId === 'wipro') {
-        window.location = `${config.URL.AUTH}/?retUrl=${config.URL.TOPGEAR}`;
-      }
       window.location = `${config.URL.AUTH}/member?retUrl=${returnUrl}&utm_source=${communityId}`;
     }
 
-    /* Redirect odl TopGear home to new TopGear App */
-    if (communityId === 'wipro'
-      && (window.location.pathname === '/' || window.location.pathname === '/__community__/wipro')) {
-      window.location = config.URL.TOPGEAR;
+    /* Redirect old TopGear home to new TopGear App and login redirect */
+    if (communityId === 'wipro') {
+      if (!visitorGroups) {
+        window.location = `${config.URL.AUTH}/?retUrl=${config.URL.TOPGEAR}&utm_source=${communityId}`;
+      } else if (window.location.pathname === '/' || window.location.pathname === '/__community__/wipro') {
+        window.location = config.URL.TOPGEAR;
+      }
     }
   }