Skip to content

Commit

Permalink
fix(test): fix running tests, fix packages/common-* lint errors
Browse files Browse the repository at this point in the history
refs LIIKUNTA-654
  • Loading branch information
karisal-anders committed Sep 4, 2024
1 parent 1f02217 commit 55616b0
Show file tree
Hide file tree
Showing 12 changed files with 82 additions and 80 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,24 +85,24 @@ jobs:
# That allows to see if we're introducing "surface" regressions (just the types)
- name: Typecheck
run: |
yarn workspaces foreach -tv --from 'events-helsinki-*' --since=origin/main --recursive run typecheck
yarn workspaces foreach -tv --exclude hobbies-helsinki --exclude events-helsinki --exclude sports-helsinki --since=origin/main run typecheck
# Lint packages that have changed (--include & --since)
- name: Linter
run: |
yarn workspaces foreach -tv --include 'events-helsinki-*' --since=origin/main --recursive run lint
yarn workspaces foreach -tv --include 'events-helsinki-*' --since=origin/main --recursive run lint-styles
yarn workspaces foreach -tv --exclude hobbies-helsinki --exclude events-helsinki --exclude sports-helsinki --since=origin/main run lint
yarn workspaces foreach -tv --exclude hobbies-helsinki --exclude events-helsinki --exclude sports-helsinki --since=origin/main run lint-styles
# Test packages that have changed (--include & --since)
- name: Unit tests changed packages
run: |
yarn workspaces foreach -tv --include 'events-helsinki-*' --since=origin/main --recursive run test
yarn workspaces foreach -tv --exclude hobbies-helsinki --exclude events-helsinki --exclude sports-helsinki --since=origin/main run test
# to debug cache issues: ls ${{ github.workspace }}/.cache
# Build packages that have changed (--include & --since), assuming that
# apps build are done already. Otherwise --from & --since
- name: Run build for changed packages
run: |
yarn workspaces foreach -tv --include 'events-helsinki-*' --since=origin/main run build
yarn workspaces foreach -tv --exclude hobbies-helsinki --exclude events-helsinki --exclude sports-helsinki --since=origin/main run build
# Test storybook build on packages that have changed (--include & --since)
- name: Run storybook build for changed packages
Expand Down
112 changes: 56 additions & 56 deletions packages/common-i18n/src/tests/initI18n.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ import i18n from 'i18next';
// eslint-disable-next-line no-restricted-imports
import { initReactI18next } from 'react-i18next';

import appEvents_en from '../locales/en/appEvents.json';
import appHobbies_en from '../locales/en/appHobbies.json';
import appSports_en from '../locales/en/appSports.json';
import cms_en from '../locales/en/cms.json';
import common_en from '../locales/en/common.json';
import consent_en from '../locales/en/consent.json';
import errors_en from '../locales/en/errors.json';
import event_en from '../locales/en/event.json';
import footer_en from '../locales/en/footer.json';
import geolocationProvider_en from '../locales/en/geolocationProvider.json';
import home_en from '../locales/en/home.json';
import notFound_en from '../locales/en/notFound.json';
import search_en from '../locales/en/search.json';
import venue_en from '../locales/en/venue.json';
import appEventsEn from '../locales/en/appEvents.json';
import appHobbiesEn from '../locales/en/appHobbies.json';
import appSportsEn from '../locales/en/appSports.json';
import cmsEn from '../locales/en/cms.json';
import commonEn from '../locales/en/common.json';
import consentEn from '../locales/en/consent.json';
import errorsEn from '../locales/en/errors.json';
import eventEn from '../locales/en/event.json';
import footerEn from '../locales/en/footer.json';
import geolocationProviderEn from '../locales/en/geolocationProvider.json';
import homeEn from '../locales/en/home.json';
import notFoundEn from '../locales/en/notFound.json';
import searchEn from '../locales/en/search.json';
import venueEn from '../locales/en/venue.json';
import appEvents from '../locales/fi/appEvents.json';
import appHobbies from '../locales/fi/appHobbies.json';
import appSports from '../locales/fi/appSports.json';
Expand All @@ -30,20 +30,20 @@ import home from '../locales/fi/home.json';
import notFound from '../locales/fi/notFound.json';
import search from '../locales/fi/search.json';
import venue from '../locales/fi/venue.json';
import appEvents_sv from '../locales/sv/appEvents.json';
import appHobbies_sv from '../locales/sv/appHobbies.json';
import appSports_sv from '../locales/sv/appSports.json';
import cms_sv from '../locales/sv/cms.json';
import common_sv from '../locales/sv/common.json';
import consent_sv from '../locales/sv/consent.json';
import errors_sv from '../locales/sv/errors.json';
import event_sv from '../locales/sv/event.json';
import footer_sv from '../locales/sv/footer.json';
import geolocationProvider_sv from '../locales/sv/geolocationProvider.json';
import home_sv from '../locales/sv/home.json';
import notFound_sv from '../locales/sv/notFound.json';
import search_sv from '../locales/sv/search.json';
import venue_sv from '../locales/sv/venue.json';
import appEventsSv from '../locales/sv/appEvents.json';
import appHobbiesSv from '../locales/sv/appHobbies.json';
import appSportsSv from '../locales/sv/appSports.json';
import cmsSv from '../locales/sv/cms.json';
import commonSv from '../locales/sv/common.json';
import consentSv from '../locales/sv/consent.json';
import errorsSv from '../locales/sv/errors.json';
import eventSv from '../locales/sv/event.json';
import footerSv from '../locales/sv/footer.json';
import geolocationProviderSv from '../locales/sv/geolocationProvider.json';
import homeSv from '../locales/sv/home.json';
import notFoundSv from '../locales/sv/notFound.json';
import searchSv from '../locales/sv/search.json';
import venueSv from '../locales/sv/venue.json';

export const translations = {
cms,
Expand Down Expand Up @@ -74,36 +74,36 @@ export const config = {
resources: {
fi: translations,
en: {
cms: cms_en,
common: common_en,
appEvents: appEvents_en,
appHobbies: appHobbies_en,
appSports: appSports_en,
consent: consent_en,
errors: errors_en,
event: event_en,
venue: venue_en,
footer: footer_en,
geolocationProvider: geolocationProvider_en,
home: home_en,
notFound: notFound_en,
search: search_en,
cms: cmsEn,
common: commonEn,
appEvents: appEventsEn,
appHobbies: appHobbiesEn,
appSports: appSportsEn,
consent: consentEn,
errors: errorsEn,
event: eventEn,
venue: venueEn,
footer: footerEn,
geolocationProvider: geolocationProviderEn,
home: homeEn,
notFound: notFoundEn,
search: searchEn,
},
sv: {
cms: cms_sv,
common: common_sv,
appEvents: appEvents_sv,
appHobbies: appHobbies_sv,
appSports: appSports_sv,
consent: consent_sv,
errors: errors_sv,
event: event_sv,
venue: venue_sv,
footer: footer_sv,
geolocationProvider: geolocationProvider_sv,
home: home_sv,
notFound: notFound_sv,
search: search_sv,
cms: cmsSv,
common: commonSv,
appEvents: appEventsSv,
appHobbies: appHobbiesSv,
appSports: appSportsSv,
consent: consentSv,
errors: errorsSv,
event: eventSv,
venue: venueSv,
footer: footerSv,
geolocationProvider: geolocationProviderSv,
home: homeSv,
notFound: notFoundSv,
search: searchSv,
},
},
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Header from '../page-model/header';
import LandingPage from '../page-model/landingPage';
import { Header } from '../page-model/header';
import { LandingPage } from '../page-model/landingPage';
import type { AppNamespace } from '../types/app-namespace';

export const changeLanguageAndTrySearch = async (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ class ClosedEventDetailsPage {
}
}

export default ClosedEventDetailsPage;
export { ClosedEventDetailsPage };
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ class ConsentModal {
}
}

export default ConsentModal;
export { ConsentModal };
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,4 @@ class EventDetailsPage {
}
}

export default EventDetailsPage;
export { EventDetailsPage };
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@ class EventSearchPage {
}
}

export default EventSearchPage;
export { EventSearchPage };
2 changes: 1 addition & 1 deletion packages/common-tests/browser-tests/page-model/header.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ class Header {
}
}

export default Header;
export { Header };
12 changes: 6 additions & 6 deletions packages/common-tests/browser-tests/page-model/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export { default as ConsentModal } from './consent-modal';
export { default as Header } from './header';
export { default as LandingPage } from './landingPage';
export { default as EventSearchPage } from './eventSearchPage';
export { default as EventDetailsPage } from './eventDetailsPage';
export { default as ClosedEventDetailsPage } from './closedEventDetailsPage';
export { ConsentModal } from './consent-modal';
export { Header } from './header';
export { LandingPage } from './landingPage';
export { EventSearchPage } from './eventSearchPage';
export { EventDetailsPage } from './eventDetailsPage';
export { ClosedEventDetailsPage } from './closedEventDetailsPage';
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ class LandingPage {
}
}

export default LandingPage;
export { LandingPage };
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ClientFunction, Role } from 'testcafe';
import ConsentModal from '../../browser-tests/page-model/consent-modal';
import { ConsentModal } from '../../browser-tests/page-model/consent-modal';
import { getEnvUrl } from '../utils/url.utils';

export const consentCookieName = 'city-of-helsinki-cookie-consents';
Expand Down
10 changes: 6 additions & 4 deletions packages/components/src/components/domain/event/queryUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@ import {
SIMILAR_EVENTS_AMOUNT,
} from '../../../constants/event-constants';
import type { EventFields } from '../../../types/event-types';
import {
import type {
EventListQuery,
EventListQueryVariables,
EventTypeId,
Meta,
QueryEventListArgs,
Meta,
} from '../../../types/generated/graphql';
import {
EventTypeId,
useEventListQuery,
} from '../../../types/generated/graphql';
import { useEventListQuery } from '../../../types/generated/graphql';
import { getEventIdFromUrl } from '../../../utils/eventUtils';

/**
Expand Down

0 comments on commit 55616b0

Please sign in to comment.