Skip to content
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

feat: common cookies #1432

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
} from './index';
import { StoryComponent } from './components/StoryComponent';
// importing the json because load won't work in e2e
import siteSettings from '../cookieConsentCore/example/helfi_sitesettings.json';
import siteSettings from '../cookieConsentCore/example/common_sitesettings.json';
import { cookieEventType } from '../cookieConsentCore/cookieConsentCore';

export default {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default {
args: {},
};

const siteSettingsJsonUrl = './static-cookie-consent/helfi_sitesettings.json';
const siteSettingsJsonUrl = './static-cookie-consent/common_sitesettings.json';

const Actions = () => {
const addChatCookie = async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import fetchMock, { disableFetchMocks, enableFetchMocks } from 'jest-fetch-mock'

import mockDocumentCookie from './__mocks__/mockDocumentCookieCore';
import { CookieConsentCore } from './cookieConsentCore';
import * as siteSettingsObjRaw from './example/helfi_sitesettings.json';
import * as siteSettingsObjRaw from './example/common_sitesettings.json';
import helpers from './helpers/cookieConsentTestHelpers';

const testTimeout = 500; // TODO: this should be removed and the tests should be refactored to work
Expand Down Expand Up @@ -66,7 +66,7 @@ describe('cookieConsentCore', () => {
}

const urls = {
siteSettingsJsonUrl: '/helfi_sitesettings.json',
siteSettingsJsonUrl: '/common_sitesettings.json',
siteSettings404: '/404.json',
siteSettingsNotJSON: '/malformed.json',
};
Expand Down
Loading
Loading