Merge branch 'veterans-http-headers' into veterans-http-headers

Author: luizrrodrigues

.circleci/config.yml

@@ -24,7 +24,7 @@ install_dependency: &install_dependency
             apk upgrade
             apk add --no-cache jq py-pip sudo
             sudo pip install awscli --upgrade
-            
+
 install_deploysuite: &install_deploysuite
           name: Installation of install_deploysuite.
           command: |
@@ -35,16 +35,17 @@ install_deploysuite: &install_deploysuite
 restore_cache_settings_for_build: &restore_cache_settings_for_build
   key: docker-node-modules-v3-{{ checksum "package-lock.json" }}
 
-save_cache_settings: &save_cache_settings    
-  key: docker-node-modules-v3-{{ checksum "package-lock.json" }}  
+save_cache_settings: &save_cache_settings
+  key: docker-node-modules-v3-{{ checksum "package-lock.json" }}
   paths:
-    - node_modules      
+    - node_modules
 
 build_docker_image: &build_docker_image
           name: Build of Docker image
           command: |
             source buildenvvar
             ./build.sh
+          no_output_timeout: 20m
 jobs:
   # Build & Deploy against development backend
   "build-dev":
@@ -58,11 +59,11 @@ jobs:
       # Restoration of node_modules from cache.
       - restore_cache: *restore_cache_settings_for_build
       # Build of Docker image.
-      - run: 
+      - run:
           name: "configuring environment"
           command: |
             ./awsconfiguration.sh DEV
-            ./buildenv.sh -e DEV -b dev_communityapp_buildvar,dev_communityapp_deployvar      
+            ./buildenv.sh -e DEV -b dev_communityapp_buildvar,dev_communityapp_deployvar
       - run: *build_docker_image
       # Caching node modules.
       - save_cache: *save_cache_settings
@@ -85,11 +86,11 @@ jobs:
       - run: *install_deploysuite
       # Restoration of node_modules from cache.
       - restore_cache: *restore_cache_settings_for_build
-      - run: 
+      - run:
           name: "configuring environment"
           command: |
             ./awsconfiguration.sh DEV
-            ./buildenv.sh -e DEV -b test_communityapp_buildvar,test_communityapp_deployvar            
+            ./buildenv.sh -e DEV -b test_communityapp_buildvar,test_communityapp_deployvar
       # Build of Docker image.
       - run: *build_docker_image
       # Caching node modules.
@@ -113,11 +114,11 @@ jobs:
       - run: *install_deploysuite
       # Restoration of node_modules from cache.
       - restore_cache: *restore_cache_settings_for_build
-      - run: 
+      - run:
           name: "configuring environment"
           command: |
             ./awsconfiguration.sh DEV
-            ./buildenv.sh -e DEV -b qa_communityapp_buildvar,qa_communityapp_deployvar            
+            ./buildenv.sh -e DEV -b qa_communityapp_buildvar,qa_communityapp_deployvar
       # Build of Docker image.
       - run: *build_docker_image
       # Caching node modules.
@@ -141,7 +142,7 @@ jobs:
       - run: *install_deploysuite
       # Restoration of node_modules from cache.
       - restore_cache: *restore_cache_settings_for_build
-      - run: 
+      - run:
           name: "configuring environment"
           command: |
             ./awsconfiguration.sh PROD
@@ -157,7 +158,7 @@ jobs:
             source awsenvconf
             source buildenvvar
             ./master_deploy.sh -d ECS -e PROD -t latest -s beta_communityapp_taskvar, -i communityapp
-  
+
   # Build & Deploy against prod api backend
   "build-prod-staging":
     <<: *defaults
@@ -169,7 +170,7 @@ jobs:
       - run: *install_deploysuite
       # Restoration of node_modules from cache.
       - restore_cache: *restore_cache_settings_for_build
-      - run: 
+      - run:
           name: "configuring environment"
           command: |
             ./awsconfiguration.sh PROD
@@ -190,7 +191,7 @@ jobs:
             --header "Circle-Token: ${CIRCLE_TOKEN}" \
             --header 'content-type: application/json' \
             --data '{"branch":"'"$CIRCLE_BRANCH"'","parameters":{"run_smoketesting":true , "run_performancetesting":false, "run_basedeployment": false}}'
-    
+
   # Build & Deploy against production backend
   "build-prod":
     <<: *defaults
@@ -202,15 +203,15 @@ jobs:
       - run: *install_deploysuite
       # Restoration of node_modules from cache.
       - restore_cache: *restore_cache_settings_for_build
-      - run: 
+      - run:
           name: "configuring environment"
           command: |
             ./awsconfiguration.sh PROD
             ./buildenv.sh -e PROD -b prod_communityapp_buildvar,prod_communityapp_deployvar
       # Build of Docker image.
       - run: *build_docker_image
       # Caching node modules.
-      - save_cache: *save_cache_settings   
+      - save_cache: *save_cache_settings
       # Deployment.
       - deploy:
           name: Running MasterScript
@@ -223,19 +224,19 @@ jobs:
             --header "Circle-Token: ${CIRCLE_TOKEN}" \
             --header 'content-type: application/json' \
             --data '{"branch":"'"$CIRCLE_BRANCH"'","parameters":{"run_smoketesting":true , "run_performancetesting":false, "run_basedeployment": false}}'
-   
+
   # Automated Smoke Testing against Staging
   Smoke-Testing-On-Staging:
     <<: *defaults
-    steps: 
+    steps:
       # Initialization.
       - checkout
       - setup_remote_docker
       - run: *install_dependency
       - run: *install_deploysuite
       # Restoration of node_modules from cache.
       - restore_cache: *restore_cache_settings_for_build
-      - run: 
+      - run:
           name: "configuring environment"
           command: |
             ./awsconfiguration.sh PROD
@@ -249,19 +250,19 @@ jobs:
             ./automated-smoke-test/smoketest.sh automation-config-staging.json prod
       - store_artifacts:
           path: ./automated-smoke-test/test-results
-  
+
    # Automated Smoke Testing against Production
   Smoke-Testing-On-Production:
     <<: *defaults
-    steps: 
+    steps:
       # Initialization.
       - checkout
       - setup_remote_docker
       - run: *install_dependency
       - run: *install_deploysuite
       # Restoration of node_modules from cache.
       - restore_cache: *restore_cache_settings_for_build
-      - run: 
+      - run:
           name: "configuring environment"
           command: |
             ./awsconfiguration.sh PROD
@@ -286,13 +287,19 @@ jobs:
       - checkout
       - restore_cache:
           key: test-node-modules-{{ checksum "package-lock.json" }}
-      - run: npm install
+      - run:
+          name: Config Git
+          command: git config --global url."https://git@".insteadOf git://
+      - run:
+          name: App npm install
+          command: npm install
+          no_output_timeout: 20m
       - save_cache:
           key: test-node-modules-{{ checksum "package-lock.json" }}
           paths:
             - node_modules
       - run: npm test
-     
+
   Performance-Testing:
     docker:
       # specify the version you desire here
@@ -330,7 +337,7 @@ jobs:
 
       - store_artifacts:
           path: target/jmeter/reports
-      
+
 workflows:
   version: 2
   Build:
@@ -343,16 +350,17 @@ workflows:
             branches:
               only:
                 - develop
+                - reskin-profile
       # This is alternate dev env for parallel testing
       - "build-test":
-          context : org-global      
+          context : org-global
           filters:
             branches:
               only:                
-                - nursoltan-s:veterans-http-headers
+                - veterans-http-headers
       # This is alternate dev env for parallel testing
       - "build-qa":
-          context : org-global      
+          context : org-global
           filters:
             branches:
               only:
@@ -363,22 +371,23 @@ workflows:
           filters:
             branches:
               only:
-                - free
+                - reskin-profile
       # This is stage env for production QA releases
       - "build-prod-staging":
-          context : org-global         
+          context : org-global
           filters: &filters-staging
             branches:
               only:
-                - develop
-      # Production builds are exectuted 
+                - fix-security-headers
+                - tco23-BS-comps
+      # Production builds are exectuted
       # when PR is merged to the master
       # Don't change anything in this configuration
-      # That might trigger wrong branch to be 
+      # That might trigger wrong branch to be
       # deployed on the production
       # master branch.
       - "build-prod":
-          context : org-global      
+          context : org-global
           filters: &filters-prod
             branches:
               only:

Dockerfile

@@ -147,6 +147,7 @@ ENV OPTIMIZELY_SDK_KEY=$OPTIMIZELY_SDK_KEY
 # Testing and build of the application inside the container.
 
 RUN npm config set unsafe-perm true
+RUN git config --global url."https://git@".insteadOf git://
 RUN npm install
 RUN npm test
 RUN npm run build

__tests__/shared/components/Leaderboard/__snapshots__/LeaderboardTable.jsx.snap

@@ -36,7 +36,9 @@ exports[`Matches shallow shapshot 1`] = `
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-rank___3kfOx"
       >
-        1
+        <span>
+          1
+        </span>
       </td>
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-avatar___3VhCz"
@@ -55,7 +57,8 @@ exports[`Matches shallow shapshot 1`] = `
         className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-handle___1wDhG"
       >
         <a
-          href="undefined/members/undefined/"
+          href="https://www.topcoder-dev.com/members/undefined/"
+          rel="noreferrer"
           style={
             Object {
               "color": null,
@@ -71,7 +74,7 @@ exports[`Matches shallow shapshot 1`] = `
              points
           </span>
           <span>
-             challenges
+            undefined challenges
           </span>
         </div>
       </td>
@@ -88,7 +91,9 @@ exports[`Matches shallow shapshot 1`] = `
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-rank___3kfOx"
       >
-        1
+        <span>
+          1
+        </span>
       </td>
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-avatar___3VhCz"
@@ -107,7 +112,8 @@ exports[`Matches shallow shapshot 1`] = `
         className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-handle___1wDhG"
       >
         <a
-          href="undefined/members/undefined/"
+          href="https://www.topcoder-dev.com/members/undefined/"
+          rel="noreferrer"
           style={
             Object {
               "color": null,
@@ -123,7 +129,7 @@ exports[`Matches shallow shapshot 1`] = `
              points
           </span>
           <span>
-             challenges
+            undefined challenges
           </span>
         </div>
       </td>
@@ -140,7 +146,9 @@ exports[`Matches shallow shapshot 1`] = `
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-rank___3kfOx"
       >
-        1
+        <span>
+          1
+        </span>
       </td>
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-avatar___3VhCz"
@@ -159,7 +167,8 @@ exports[`Matches shallow shapshot 1`] = `
         className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-handle___1wDhG"
       >
         <a
-          href="undefined/members/undefined/"
+          href="https://www.topcoder-dev.com/members/undefined/"
+          rel="noreferrer"
           style={
             Object {
               "color": null,
@@ -175,7 +184,7 @@ exports[`Matches shallow shapshot 1`] = `
              points
           </span>
           <span>
-             challenges
+            undefined challenges
           </span>
         </div>
       </td>
@@ -192,7 +201,9 @@ exports[`Matches shallow shapshot 1`] = `
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-rank___3kfOx"
       >
-        1
+        <span>
+          1
+        </span>
       </td>
       <td
         className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-avatar___3VhCz"
@@ -211,7 +222,8 @@ exports[`Matches shallow shapshot 1`] = `
         className="src-shared-components-Leaderboard-LeaderboardTable-themes-___styles__col-handle___1wDhG"
       >
         <a
-          href="undefined/members/undefined/"
+          href="https://www.topcoder-dev.com/members/undefined/"
+          rel="noreferrer"
           style={
             Object {
               "color": null,
@@ -227,7 +239,7 @@ exports[`Matches shallow shapshot 1`] = `
              points
           </span>
           <span>
-             challenges
+            undefined challenges
           </span>
         </div>
       </td>