diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b76bb33a4..cdfc3240c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -80,43 +80,3 @@ jobs: path: | .coverage coverage.xml - - coverage: - name: Coverage - needs: [frontend, backend] - runs-on: SFDO-Tooling-Ubuntu - env: - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - steps: - - uses: actions/checkout@v3 - - uses: ./.github/setup-docker-compose - with: - omniout-token: ${{ secrets.OMNIOUT_TOKEN }} - - name: Download frontend coverage artifacts - uses: actions/download-artifact@v3 - with: - name: frontend-coverage - path: coverage - - name: Download backend coverage artifacts - uses: actions/download-artifact@v3 - with: - name: backend-coverage - - name: Upload coverage reports - if: env.COVERALLS_REPO_TOKEN - # prettier-ignore - run: > - docker-compose run - -e COVERALLS_REPO_TOKEN - -e COVERALLS_PARALLEL=true - -e COVERALLS_SERVICE_NUMBER="${{ github.run_id }}" - -e CI_BUILD_NUMBER="${{ github.run_id }}" - --no-deps - web bash -c ' - yarn test:js:report-coverage && - yarn test:py:report-coverage && - python -m coveralls --finish - ' - - name: Check coverage - run: | - docker-compose run --no-deps web yarn test:js:check-coverage - docker-compose run --no-deps web yarn test:py:check-coverage diff --git a/src/js/index.tsx b/src/js/index.tsx index 95e996b6d..a0fadc900 100644 --- a/src/js/index.tsx +++ b/src/js/index.tsx @@ -45,7 +45,7 @@ import { createSocket } from '@/js/utils/websockets'; const history = createBrowserHistory(); -console.log('>>> index.tsx'); +log('>>> index.tsx'); const App = () => ( @@ -100,7 +100,7 @@ init_i18n((i18nError?: string) => { log(i18nError); } const el = document.getElementById('app'); - console.log('>>> fetched app element'); + log('>>> fetched app element'); if (el) { // Remove scratch org UUID from URL const scratchOrgUUID = getUrlParam(SCRATCH_ORG_QS); @@ -108,19 +108,20 @@ init_i18n((i18nError?: string) => { history.replace({ search: removeUrlParam(SCRATCH_ORG_QS) }); } - console.log('>>> creating app store'); + log('>>> creating app store'); // Create store const appStore = createStore( reducer, undefined, composeWithDevTools( + // eslint-disable-next-line // @ts-ignore applyMiddleware(thunk.withExtraArgument(history), logger), ), ); - console.log('>>> appStore created'); + log('>>> appStore created'); - console.log('>>> connecting to websocket server'); + log('>>> connecting to websocket server'); // Connect to WebSocket server const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'; const host = window.location.host; @@ -133,7 +134,7 @@ init_i18n((i18nError?: string) => { }, }, }); - console.log('>>> connected to websocket server'); + log('>>> connected to websocket server'); // Get JS globals let GLOBALS = {}; @@ -178,7 +179,7 @@ init_i18n((i18nError?: string) => { // Set App element (used for react-SLDS modals) settings.setAppElement(el); - console.log('>>> about to fetch products'); + log('>>> about to fetch products'); // Fetch products before rendering App (appStore.dispatch as ThunkDispatch)(fetchProducts()).finally(() => { (appStore.dispatch as ThunkDispatch)(fetchOrgJobs()); @@ -201,6 +202,6 @@ init_i18n((i18nError?: string) => { , ); }); - console.log('>>> fetched products'); + log('>>> fetched products'); } });