Skip to content

WIP: Reskin for Unit Test Checking #6344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 64 commits into from
May 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
f24ee71
new challenge listing winning submission
dedywahyudi May 7, 2022
163fb12
fix typo for circle icon
dedywahyudi May 7, 2022
be7f720
ci: deploy new-challenge-listing to Dev env
luizrrodrigues May 9, 2022
67346c0
submission upload 1st f2f
dedywahyudi May 10, 2022
db67a7e
fix feedback issues
May 10, 2022
492ad96
Merge pull request #6332 from nursoltan-s/challenge-listing-feedback
dedywahyudi May 10, 2022
fc710d9
improvement(challenge-listing): change to doublequotes for eslint error
dedywahyudi May 10, 2022
2157b14
improvement(new-challenge-listing): fix circleci error
dedywahyudi May 10, 2022
7fb48b9
improvement(new-challenge-listing): remove unused track
dedywahyudi May 10, 2022
9f85986
improvement(new-challenge-listing): remove unused track
dedywahyudi May 10, 2022
ecce0bf
improvement(new-challenge-listing): fix npm test
dedywahyudi May 10, 2022
b7e84d5
Update style.scss
dedywahyudi May 10, 2022
c73f179
Update style.scss
dedywahyudi May 10, 2022
3d46ca8
additional fixes from challenge listing reskin
May 10, 2022
e04519d
detail page 1st f2f
dedywahyudi May 10, 2022
fa3806b
fix lint issue
May 10, 2022
72c56f7
Merge pull request #6334 from nursoltan-s/additional-fixes
dedywahyudi May 10, 2022
f7d976f
fix(new-submission-upload): upload progress f2f part 2
dedywahyudi May 10, 2022
e25d866
v2 submission upload progress
dedywahyudi May 11, 2022
63f6fbc
Merge branch 'temp-new-submissions-upload' into new-submissions-upload
dedywahyudi May 11, 2022
7d31b5c
improvement(new-submission-upload): f2f part 3 manage submissions
dedywahyudi May 11, 2022
6438560
improvement(new-challenge-detail): checkpoints tab
dedywahyudi May 11, 2022
caff69f
improvement(new-challenge-detail): lint issue
dedywahyudi May 11, 2022
a9eb022
improvement(new-submissions-upload): npm run jest
dedywahyudi May 11, 2022
9f7b83b
Merge pull request #6329 from topcoder-platform/new-challenge-listing
luizrrodrigues May 12, 2022
8692bbb
Merge pull request #6336 from topcoder-platform/new-submissions-upload
luizrrodrigues May 12, 2022
6251d7f
ci: deploy reskin to Dev env
luizrrodrigues May 12, 2022
bfbff19
improvement(new-challenge-detail): dashboard tab f2f
dedywahyudi May 12, 2022
0671444
improvement(new-challenge-detail): submission tab f2f
dedywahyudi May 12, 2022
537aa2f
Merge branch 'temp-submissions-tab' into new-challenge-details
dedywahyudi May 12, 2022
80f536e
fix(new-challenge-details): fix error lint
dedywahyudi May 12, 2022
f56fdf0
improvement(new-challenge-details): submissions tab f2f
dedywahyudi May 13, 2022
53d65b8
improvement(new-challenge-detail): registrants tab f2f
dedywahyudi May 13, 2022
db5f450
Merge pull request #6343 from topcoder-platform/temp-registrants
dedywahyudi May 13, 2022
dee7a19
Merge branch 'reskin' into new-challenge-details
dedywahyudi May 13, 2022
80d17e2
Merge pull request #6335 from topcoder-platform/new-challenge-details
luizrrodrigues May 13, 2022
1e8983a
improvement(reskin): qa past challenges
dedywahyudi May 17, 2022
c77263b
improvement(reskin): open for review tab f2f
dedywahyudi May 18, 2022
92932bd
Restore package-lock.json
luizrrodrigues May 18, 2022
5838cc3
ci: Disable restore
luizrrodrigues May 18, 2022
d09038a
improvement(reskin): challenge detail QA - Part 1 f2f
dedywahyudi May 18, 2022
8fbd8a5
improvement(reskin): open for registration f2f
dedywahyudi May 18, 2022
2ececf8
Merge pull request #6347 from topcoder-platform/develop
luizrrodrigues May 18, 2022
b3cebf4
improvement(reskin): detail qa - part 3
dedywahyudi May 19, 2022
3943aed
improvement(reskin): submission upload - part 1 f2f
dedywahyudi May 19, 2022
4072f0d
improvement(reskin): qa element style issues f2f
dedywahyudi May 20, 2022
ac8279c
fix(reskin): suppress eslint max-len
dedywahyudi May 20, 2022
4401b3a
fix(reskin): fix lint issues
dedywahyudi May 20, 2022
0473229
improvement(reskin): submission detail - part 4 f2f
dedywahyudi May 20, 2022
f88b2c1
Merge branch 'develop' into reskin
dedywahyudi May 20, 2022
0c36186
improvement(reskin): lint issue color-hex-case
dedywahyudi May 20, 2022
659acf2
improvement(reskin): text spacing in manage submission
dedywahyudi May 20, 2022
5f32b58
improvement(reskin): open review mobile f2f
dedywahyudi May 21, 2022
5a11d19
improvement(reskin): calendar picker - part 2 f2f
dedywahyudi May 22, 2022
4f4fe79
improvement(reskin): submission upload - part 2 f2f
dedywahyudi May 23, 2022
f4f290e
improvement(reskin): jest update
dedywahyudi May 23, 2022
c5bf2f3
improvement(reskin): calendar picker - part 1 f2f
dedywahyudi May 23, 2022
50944e1
improvement(reskin): submission detail - part 2 f2f
dedywahyudi May 23, 2022
1350ee8
improvement(reskin): element style fixes - part 2 f2f
dedywahyudi May 23, 2022
7db4ba2
improvement(reskin): mobile tab issues f2f
dedywahyudi May 24, 2022
9c94efc
improvement(reskin): qa text updates
dedywahyudi May 24, 2022
ad933a9
improvement(reskin): sort dropdown mobile
dedywahyudi May 25, 2022
dfb002e
improvement(reskin): challenge listing part 5 f2f
dedywahyudi May 25, 2022
7f9e1ca
improvement(reskin): mm submissions
dedywahyudi May 25, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 34 additions & 33 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -35,10 +35,10 @@ 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
Expand All @@ -59,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
Expand All @@ -86,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.
Expand All @@ -114,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.
Expand All @@ -142,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
Expand All @@ -158,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
Expand All @@ -170,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
Expand All @@ -191,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
Expand All @@ -203,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
Expand All @@ -224,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
Expand All @@ -250,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
Expand Down Expand Up @@ -290,7 +290,7 @@ jobs:
- run:
name: Config Git
command: git config --global url."https://git@".insteadOf git://
- run:
- run:
name: App npm install
command: npm install
no_output_timeout: 20m
Expand All @@ -299,7 +299,7 @@ jobs:
paths:
- node_modules
- run: npm test

Performance-Testing:
docker:
# specify the version you desire here
Expand Down Expand Up @@ -337,7 +337,7 @@ jobs:

- store_artifacts:
path: target/jmeter/reports

workflows:
version: 2
Build:
Expand All @@ -349,17 +349,18 @@ workflows:
filters:
branches:
only:
- free
- develop
- reskin
# This is alternate dev env for parallel testing
- "build-test":
context : org-global
context : org-global
filters:
branches:
only:
only:
- circleci-fix
# This is alternate dev env for parallel testing
- "build-qa":
context : org-global
context : org-global
filters:
branches:
only:
Expand All @@ -373,20 +374,20 @@ workflows:
- thrive-discord-button
# This is stage env for production QA releases
- "build-prod-staging":
context : org-global
context : org-global
filters: &filters-staging
branches:
only:
- develop
- stat_marathon_match_link
# Production builds are exectuted
# 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:
Expand Down
19 changes: 0 additions & 19 deletions __tests__/shared/components/SortingSelectBar.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';
import Renderer from 'react-test-renderer/shallow';
import TU from 'react-dom/test-utils';
import SortingSelectBar from 'components/SortingSelectBar';

const mockData = {
Expand Down Expand Up @@ -30,21 +29,3 @@ test('Matches shallow shapshot', () => {
));
expect(renderer.getRenderOutput()).toMatchSnapshot();
});

class Wrapper extends React.Component {
componentDidMount() {}

render() {
return <SortingSelectBar {...this.props} />;
}
}

const instance = TU.renderIntoDocument((<Wrapper {...mockData} />));

test('Render properly', () => {
const dropdown = TU.findAllInRenderedTree(instance, item => item && item.className && item.className.match('Select-control'));
TU.Simulate.touchEnd(dropdown[0]);
const options = TU.findAllInRenderedTree(instance, item => item && item.className && item.className.match('Select-option'));
expect(options).toHaveLength(1);
TU.Simulate.click(options[0]);
});
Loading