From 4c957818a1b1cf1d3c05e6f1ef1a9664c7340a96 Mon Sep 17 00:00:00 2001 From: Chris Raible Date: Wed, 18 Feb 2026 14:19:29 -0800 Subject: [PATCH 1/4] Removed unused useFeatureFlag and withFeatureFlag hook from stats app (#26056) No user-facing change included in this commit - this just deletes dead code. These hooks were used when analytics was gated behind a feature flag, but they're currently not in use anywhere in the stats app. It's a little confusing to keep these around, especially because the naming isn't as specific as it could be. We can always reintroduce these if we need to gate certain routes by feature flag, with a more specific name. --- apps/stats/src/hooks/use-feature-flag.tsx | 54 --------- apps/stats/src/hooks/with-feature-flag.tsx | 52 -------- apps/stats/src/routes.tsx | 5 - .../test/unit/hooks/use-feature-flag.test.tsx | 100 ---------------- .../unit/hooks/with-feature-flag.test.tsx | 113 ------------------ 5 files changed, 324 deletions(-) delete mode 100644 apps/stats/src/hooks/use-feature-flag.tsx delete mode 100644 apps/stats/src/hooks/with-feature-flag.tsx delete mode 100644 apps/stats/test/unit/hooks/use-feature-flag.test.tsx delete mode 100644 apps/stats/test/unit/hooks/with-feature-flag.test.tsx diff --git a/apps/stats/src/hooks/use-feature-flag.tsx b/apps/stats/src/hooks/use-feature-flag.tsx deleted file mode 100644 index fbf85eda7c5..00000000000 --- a/apps/stats/src/hooks/use-feature-flag.tsx +++ /dev/null @@ -1,54 +0,0 @@ -import {Navigate} from '@tryghost/admin-x-framework'; -import {getSettingValue} from '@tryghost/admin-x-framework/api/settings'; -import {useGlobalData} from '@src/providers/global-data-provider'; - -/** - * Custom hook to check if a feature flag is enabled - * Handles loading states to prevent premature redirects - * - * @param flagName The name of the feature flag to check - * @param fallbackPath The path to redirect to if feature flag is disabled - * @returns An object containing the feature flag status and optional component to render - */ -export const useFeatureFlag = (flagName: string, fallbackPath: string) => { - const {isLoading, settings} = useGlobalData(); - - // Parse labs settings - const labsJSON = getSettingValue(settings, 'labs') || '{}'; - let labs: Record = {}; - - try { - labs = JSON.parse(labsJSON); - } catch { - // If JSON parsing fails, fall back to empty object - labs = {}; - } - - // Check if the feature flag is enabled - const isEnabled = labs[flagName] === true; - - // If loading, don't make a decision yet - if (isLoading) { - return { - isEnabled: false, - isLoading: true, - redirect: null - }; - } - - // If feature flag is disabled, return redirect component - if (!isEnabled) { - return { - isEnabled: false, - isLoading: false, - redirect: - }; - } - - // Feature flag is enabled - return { - isEnabled: true, - isLoading: false, - redirect: null - }; -}; diff --git a/apps/stats/src/hooks/with-feature-flag.tsx b/apps/stats/src/hooks/with-feature-flag.tsx deleted file mode 100644 index 4f00fc803ba..00000000000 --- a/apps/stats/src/hooks/with-feature-flag.tsx +++ /dev/null @@ -1,52 +0,0 @@ -import React from 'react'; -import StatsLayout from '@views/Stats/layout/stats-layout'; -import StatsView from '@views/Stats/layout/stats-view'; -import {H1, ViewHeader} from '@tryghost/shade'; -import {useFeatureFlag} from './use-feature-flag'; - -/** - * Higher-Order Component that wraps a component with feature flag checking - * - * @param Component The component to wrap - * @param flagName The name of the feature flag to check - * @param fallbackPath The path to redirect to if feature flag is disabled - * @param title The title to display in the loading state - * @returns A new component wrapped with feature flag checking - */ -export const withFeatureFlag =

( - Component: React.ComponentType

, - flagName: string, - fallbackPath: string, - title: string -) => { - const WrappedComponent = (props: P) => { - const {isLoading, redirect} = useFeatureFlag(flagName, fallbackPath); - - // If we have a redirect component, render it - if (redirect) { - return redirect; - } - - // If we're loading, render a loading state - if (isLoading) { - return ( - - -

{title}

- - -
{/* Loading placeholder */}
-
- - ); - } - - // Otherwise render the wrapped component - return ; - }; - - // Set display name for debugging - WrappedComponent.displayName = `withFeatureFlag(${Component.displayName || Component.name || 'Component'})`; - - return WrappedComponent; -}; diff --git a/apps/stats/src/routes.tsx b/apps/stats/src/routes.tsx index 3e2695b8a86..7f410b727e4 100644 --- a/apps/stats/src/routes.tsx +++ b/apps/stats/src/routes.tsx @@ -1,12 +1,7 @@ import {RouteObject, lazyComponent} from '@tryghost/admin-x-framework'; -// import {withFeatureFlag} from './hooks/withFeatureFlag'; export const APP_ROUTE_PREFIX = '/'; -// Wrap all components with feature flag protection -// e.g. -// const ProtectedOverview = withFeatureFlag(Overview, 'trafficAnalyticsAlpha', '/', 'Overview'); - export const routes: RouteObject[] = [ { path: 'analytics', diff --git a/apps/stats/test/unit/hooks/use-feature-flag.test.tsx b/apps/stats/test/unit/hooks/use-feature-flag.test.tsx deleted file mode 100644 index 2560eaa3562..00000000000 --- a/apps/stats/test/unit/hooks/use-feature-flag.test.tsx +++ /dev/null @@ -1,100 +0,0 @@ -import {beforeEach, describe, expect, it, vi} from 'vitest'; -import {renderHook} from '@testing-library/react'; -import {setupStatsAppMocks} from '../../utils/test-helpers'; -import {useFeatureFlag} from '@hooks/use-feature-flag'; - -// Mock the dependencies -vi.mock('@src/providers/global-data-provider'); -vi.mock('@tryghost/admin-x-framework/api/settings'); - -const mockUseGlobalData = vi.mocked(await import('@src/providers/global-data-provider')).useGlobalData; -const mockGetSettingValue = vi.mocked(await import('@tryghost/admin-x-framework/api/settings')).getSettingValue; - -describe('useFeatureFlag', () => { - let mocks: ReturnType; - - beforeEach(() => { - vi.clearAllMocks(); - mocks = setupStatsAppMocks(); - - // Apply the mocks to the actual imported modules - mockUseGlobalData.mockImplementation(mocks.mockUseGlobalData); - mockGetSettingValue.mockImplementation(mocks.mockGetSettingValue); - }); - - it('returns loading state when data is loading', () => { - mocks.mockUseGlobalData.mockReturnValue({ - ...mocks.mockUseGlobalData.mock.results[0]?.value || {}, - isLoading: true, - settings: [] - }); - - const {result} = renderHook(() => useFeatureFlag('testFlag', '/fallback')); - - expect(result.current).toEqual({ - isEnabled: false, - isLoading: true, - redirect: null - }); - }); - - it('returns enabled state when feature flag is true', () => { - mocks.mockGetSettingValue.mockReturnValue('{"testFlag": true}'); - - const {result} = renderHook(() => useFeatureFlag('testFlag', '/fallback')); - - expect(result.current.isEnabled).toBe(true); - expect(result.current.isLoading).toBe(false); - expect(result.current.redirect).toBe(null); - }); - - it('returns disabled state with redirect when feature flag is false', () => { - mocks.mockGetSettingValue.mockReturnValue('{"testFlag": false}'); - - const {result} = renderHook(() => useFeatureFlag('testFlag', '/fallback')); - - expect(result.current.isEnabled).toBe(false); - expect(result.current.isLoading).toBe(false); - expect(result.current.redirect).toBeTruthy(); - }); - - it('returns disabled state when feature flag is not present', () => { - mocks.mockGetSettingValue.mockReturnValue('{}'); - - const {result} = renderHook(() => useFeatureFlag('testFlag', '/fallback')); - - expect(result.current.isEnabled).toBe(false); - expect(result.current.isLoading).toBe(false); - expect(result.current.redirect).toBeTruthy(); - }); - - it('handles invalid JSON gracefully', () => { - mocks.mockGetSettingValue.mockReturnValue('invalid json'); - - const {result} = renderHook(() => useFeatureFlag('testFlag', '/fallback')); - - expect(result.current.isEnabled).toBe(false); - expect(result.current.isLoading).toBe(false); - expect(result.current.redirect).toBeTruthy(); - }); - - it('handles null labs setting', () => { - mocks.mockGetSettingValue.mockReturnValue(null); - - const {result} = renderHook(() => useFeatureFlag('testFlag', '/fallback')); - - expect(result.current.isEnabled).toBe(false); - expect(result.current.isLoading).toBe(false); - expect(result.current.redirect).toBeTruthy(); - }); - - it('handles undefined labs setting', () => { - mocks.mockGetSettingValue.mockReturnValue(undefined); - - const {result} = renderHook(() => useFeatureFlag('testFlag', '/fallback')); - - expect(result.current.isEnabled).toBe(false); - expect(result.current.isLoading).toBe(false); - expect(result.current.redirect).toBeTruthy(); - }); -}); diff --git a/apps/stats/test/unit/hooks/with-feature-flag.test.tsx b/apps/stats/test/unit/hooks/with-feature-flag.test.tsx deleted file mode 100644 index a7098e65f53..00000000000 --- a/apps/stats/test/unit/hooks/with-feature-flag.test.tsx +++ /dev/null @@ -1,113 +0,0 @@ -import React from 'react'; -import {beforeEach, describe, expect, it, vi} from 'vitest'; -import {render, screen} from '@testing-library/react'; -import {withFeatureFlag} from '@hooks/with-feature-flag'; - -// Mock the dependencies -vi.mock('@src/hooks/use-feature-flag'); -vi.mock('@src/views/Stats/layout/stats-layout', () => ({ - default: ({children}: {children: React.ReactNode}) =>
{children}
-})); -vi.mock('@src/views/Stats/layout/stats-view', () => ({ - default: ({children, isLoading}: {children: React.ReactNode; isLoading: boolean}) => ( -
{children}
- ) -})); -vi.mock('@tryghost/shade', () => ({ - H1: ({children}: {children: React.ReactNode}) =>

{children}

, - ViewHeader: ({children}: {children: React.ReactNode}) =>
{children}
-})); - -const mockUseFeatureFlag = vi.mocked(await import('@hooks/use-feature-flag')).useFeatureFlag; - -// Test component -const TestComponent = ({message}: {message: string}) =>
{message}
; - -describe('withFeatureFlag', () => { - beforeEach(() => { - vi.clearAllMocks(); - }); - - it('renders the wrapped component when feature flag is enabled', () => { - mockUseFeatureFlag.mockReturnValue({ - isEnabled: true, - isLoading: false, - redirect: null - }); - - const WrappedComponent = withFeatureFlag(TestComponent, 'testFlag', '/fallback', 'Test Title'); - render(); - - expect(screen.getByTestId('test-component')).toBeInTheDocument(); - expect(screen.getByText('Hello World')).toBeInTheDocument(); - }); - - it('renders loading state when feature flag is loading', () => { - mockUseFeatureFlag.mockReturnValue({ - isEnabled: false, - isLoading: true, - redirect: null - }); - - const WrappedComponent = withFeatureFlag(TestComponent, 'testFlag', '/fallback', 'Test Title'); - render(); - - expect(screen.getByTestId('stats-layout')).toBeInTheDocument(); - expect(screen.getByTestId('view-header')).toBeInTheDocument(); - expect(screen.getByText('Test Title')).toBeInTheDocument(); - expect(screen.getByTestId('stats-view')).toHaveAttribute('data-loading', 'true'); - expect(screen.queryByTestId('test-component')).not.toBeInTheDocument(); - }); - - it('renders redirect component when feature flag is disabled', () => { - const mockRedirect =
Redirecting...
; - mockUseFeatureFlag.mockReturnValue({ - isEnabled: false, - isLoading: false, - redirect: mockRedirect - }); - - const WrappedComponent = withFeatureFlag(TestComponent, 'testFlag', '/fallback', 'Test Title'); - render(); - - expect(screen.getByTestId('redirect')).toBeInTheDocument(); - expect(screen.getByText('Redirecting...')).toBeInTheDocument(); - expect(screen.queryByTestId('test-component')).not.toBeInTheDocument(); - }); - - it('passes props correctly to the wrapped component', () => { - mockUseFeatureFlag.mockReturnValue({ - isEnabled: true, - isLoading: false, - redirect: null - }); - - const WrappedComponent = withFeatureFlag(TestComponent, 'testFlag', '/fallback', 'Test Title'); - render(); - - expect(screen.getByText('Custom Message')).toBeInTheDocument(); - }); - - it('sets correct display name for the wrapped component', () => { - mockUseFeatureFlag.mockReturnValue({ - isEnabled: true, - isLoading: false, - redirect: null - }); - - const WrappedComponent = withFeatureFlag(TestComponent, 'testFlag', '/fallback', 'Test Title'); - expect(WrappedComponent.displayName).toBe('withFeatureFlag(TestComponent)'); - }); - - it('handles component without display name', () => { - mockUseFeatureFlag.mockReturnValue({ - isEnabled: true, - isLoading: false, - redirect: null - }); - - const AnonymousComponent = () =>
Anonymous
; - const WrappedComponent = withFeatureFlag(AnonymousComponent, 'testFlag', '/fallback', 'Test Title'); - expect(WrappedComponent.displayName).toBe('withFeatureFlag(AnonymousComponent)'); - }); -}); From 0743eb5ef9fb02caa07732999269730bf4c925fc Mon Sep 17 00:00:00 2001 From: Evan Hahn Date: Wed, 18 Feb 2026 16:21:57 -0600 Subject: [PATCH 2/4] Fixed flaky "no OTC in email" test (#26494) ref https://github.com/TryGhost/Ghost/actions/runs/22154549172/job/64055168837 We had an assertion error like this: Email HTML should not contain OTC. Found: "860572" near: "0.1:4015/members/?token=th0fWUDq5WKKteGjd3CSaLYwIC860572&action=signin" If the token has six consecutive numbers, the test will fail. To fix that, we only check the actual text, not HTML attributes. --- ghost/core/test/e2e-api/members/send-magic-link.test.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ghost/core/test/e2e-api/members/send-magic-link.test.js b/ghost/core/test/e2e-api/members/send-magic-link.test.js index cfced69f42c..eaac5ff916a 100644 --- a/ghost/core/test/e2e-api/members/send-magic-link.test.js +++ b/ghost/core/test/e2e-api/members/send-magic-link.test.js @@ -1,6 +1,7 @@ const {agentProvider, mockManager, fixtureManager, matchers, configUtils, resetRateLimits, dbUtils} = require('../../utils/e2e-framework'); const sinon = require('sinon'); const assert = require('node:assert/strict'); +const cheerio = require('cheerio'); const {assertMatchSnapshot} = require('../../utils/assertions'); const settingsCache = require('../../../core/shared/settings-cache'); const settingsService = require('../../../core/server/services/settings'); @@ -788,11 +789,13 @@ describe('sendMagicLink', function () { const subjectMatch = mail.subject.match(otcRegex); assert(!subjectMatch, `Email subject should not contain OTC. Found: "${subjectMatch?.[0]}" in subject: "${mail.subject}"`); - const htmlMatch = mail.html.match(otcRegex); - assert(!htmlMatch, `Email HTML should not contain OTC. Found: "${htmlMatch?.[0]}" near: "${mail.html.substring(mail.html.search(otcRegex) - 50, mail.html.search(otcRegex) + 100)}"`); - const textMatch = mail.text.match(otcRegex); assert(!textMatch, `Email text should not contain OTC. Found: "${textMatch?.[0]}" near: "${mail.text.substring(mail.text.search(otcRegex) - 50, mail.text.search(otcRegex) + 100)}"`); + + // It's possible that there's an OTC-like in an href, so only check the rendered text. + const htmlText = cheerio.load(mail.html).text(); + const htmlMatch = htmlText.match(otcRegex); + assert(!htmlMatch, `Email HTML should not contain OTC. Found: "${htmlMatch?.[0]}" near: "${htmlText.substring(htmlText.search(otcRegex) - 50, htmlText.search(otcRegex) + 100)}"`); } beforeEach(async function () { From 9b3d4efe2cc865e3b4d83306096bcef8d4c54848 Mon Sep 17 00:00:00 2001 From: Evan Hahn Date: Wed, 18 Feb 2026 16:34:56 -0600 Subject: [PATCH 3/4] Uninstalled Should.js (#26500) no ref This is a test-only change that should have no user impact. Now that we're not using Should.js any more, we can remove it completely. --- ghost/core/package.json | 1 - ghost/core/test/e2e-api/admin/actions.test.js | 1 - .../core/test/e2e-api/admin/comments.test.js | 1 - ghost/core/test/e2e-api/admin/files.test.js | 1 - .../test/e2e-api/admin/integrations.test.js | 1 - ghost/core/test/e2e-api/admin/invites.test.js | 1 - .../e2e-api/admin/key-authentication.test.js | 1 - .../test/e2e-api/admin/max-limit-cap.test.js | 1 - ghost/core/test/e2e-api/admin/media.test.js | 1 - .../e2e-api/admin/members-importer.test.js | 1 - ghost/core/test/e2e-api/admin/members.test.js | 1 - ghost/core/test/e2e-api/admin/oembed.test.js | 1 - .../test/e2e-api/admin/pages-legacy.test.js | 1 - .../test/e2e-api/admin/posts-bulk.test.js | 1 - .../test/e2e-api/admin/posts-legacy.test.js | 1 - .../core/test/e2e-api/admin/redirects.test.js | 1 - .../core/test/e2e-api/admin/snippets.test.js | 1 - .../admin/storage-adapter-switching.test.js | 1 - ghost/core/test/e2e-api/admin/tags.test.js | 1 - .../content/key-authentication.test.js | 1 - .../e2e-api/content/max-limit-cap.test.js | 1 - ghost/core/test/e2e-api/content/tags.test.js | 1 - .../e2e-api/members-comments/comments.test.js | 1 - .../members-comments/max-limit-cap.test.js | 1 - .../create-stripe-checkout-session.test.js | 1 - .../test/e2e-api/members/middleware.test.js | 1 - .../test/e2e-frontend/custom-routes.test.js | 1 - .../test/e2e-frontend/email-routes.test.js | 1 - .../e2e-frontend/helpers/next-post.test.js | 1 - .../test/e2e-frontend/member-stats.test.js | 1 - ghost/core/test/e2e-server/admin.test.js | 1 - .../integration/exporter/exporter.test.js | 1 - .../core/test/integration/importer/v1.test.js | 1 - .../core/test/integration/importer/v2.test.js | 1 - .../migrations/nullable-utils.test.js | 1 - .../services/last-seen-at-updater.test.js | 1 - .../core/test/integration/url-service.test.js | 1 - .../test/legacy/api/admin/identities.test.js | 1 - .../core/test/legacy/api/admin/images.test.js | 1 - .../legacy/api/admin/members-importer.test.js | 1 - .../api/admin/members-signin-url.test.js | 1 - .../core/test/legacy/api/admin/pages.test.js | 1 - .../core/test/legacy/api/admin/posts.test.js | 1 - .../test/legacy/api/admin/redirects.test.js | 1 - .../test/legacy/api/admin/schedules.test.js | 1 - .../test/legacy/api/admin/settings.test.js | 1 - .../core/test/legacy/api/admin/users.test.js | 1 - .../test/legacy/api/admin/webhooks.test.js | 1 - .../test/legacy/api/content/authors.test.js | 1 - .../test/legacy/api/content/pages.test.js | 1 - .../test/legacy/api/content/posts.test.js | 1 - .../core/test/legacy/api/content/tags.test.js | 1 - .../api-vs-frontend.test.js | 1 - .../parent-app-vhosts.test.js | 1 - .../test/legacy/models/base/listeners.test.js | 1 - .../model-member-stripe-customer.test.js | 1 - .../test/legacy/models/model-members.test.js | 1 - .../legacy/models/model-newsletters.test.js | 1 - .../test/legacy/models/model-posts.test.js | 1 - .../test/legacy/models/model-settings.test.js | 1 - .../test/legacy/models/model-snippets.test.js | 1 - ...model-stripe-customer-subscription.test.js | 1 - .../test/legacy/models/model-tags.test.js | 1 - .../test/legacy/models/model-users.test.js | 1 - .../test/legacy/site/dynamic-routing.test.js | 1 - ghost/core/test/legacy/site/frontend.test.js | 1 - .../core/test/unit/api/canary/session.test.js | 1 - .../test/unit/api/canary/utils/index.test.js | 1 - .../utils/serializers/input/members.test.js | 1 - .../utils/serializers/output/all.test.js | 1 - .../utils/serializers/output/mapper.test.js | 1 - .../utils/serializers/output/members.test.js | 1 - .../apps/private-blogging/controller.test.js | 1 - .../private-blogging/input-password.test.js | 1 - .../apps/private-blogging/middleware.test.js | 1 - .../unit/frontend/helpers/authors.test.js | 1 - .../unit/frontend/helpers/body-class.test.js | 1 - .../frontend/helpers/comment-count.test.js | 1 - .../unit/frontend/helpers/comments.test.js | 1 - .../test/unit/frontend/helpers/concat.test.js | 1 - .../frontend/helpers/content-api-key.test.js | 1 - .../frontend/helpers/content-api-url.test.js | 1 - .../unit/frontend/helpers/content.test.js | 1 - .../test/unit/frontend/helpers/date.test.js | 1 - .../test/unit/frontend/helpers/encode.test.js | 1 - .../unit/frontend/helpers/excerpt.test.js | 1 - .../frontend/helpers/facebook-url.test.js | 1 - .../unit/frontend/helpers/foreach.test.js | 1 - .../test/unit/frontend/helpers/get.test.js | 1 - .../unit/frontend/helpers/ghost-foot.test.js | 1 - .../unit/frontend/helpers/ghost-head.test.js | 1 - .../test/unit/frontend/helpers/has.test.js | 1 - .../unit/frontend/helpers/img-url.test.js | 1 - .../unit/frontend/helpers/link-class.test.js | 1 - .../test/unit/frontend/helpers/link.test.js | 1 - .../test/unit/frontend/helpers/match.test.js | 1 - .../frontend/helpers/meta-description.test.js | 1 - .../unit/frontend/helpers/meta-title.test.js | 1 - .../unit/frontend/helpers/navigation.test.js | 1 - .../unit/frontend/helpers/page-url.test.js | 1 - .../test/unit/frontend/helpers/plural.test.js | 1 - .../unit/frontend/helpers/post-class.test.js | 1 - .../test/unit/frontend/helpers/raw.test.js | 1 - .../frontend/helpers/reading-time.test.js | 1 - .../test/unit/frontend/helpers/search.test.js | 1 - .../unit/frontend/helpers/social-url.test.js | 1 - .../test/unit/frontend/helpers/t-new.test.js | 1 - .../core/test/unit/frontend/helpers/t.test.js | 1 - .../test/unit/frontend/helpers/tags.test.js | 1 - .../test/unit/frontend/helpers/tiers.test.js | 1 - .../test/unit/frontend/helpers/title.test.js | 1 - .../helpers/total-paid-members.test.js | 1 - .../unit/frontend/helpers/twitter-url.test.js | 1 - .../test/unit/frontend/helpers/url.test.js | 1 - .../unit/frontend/meta/author-fb-url.test.js | 1 - .../unit/frontend/meta/author-image.test.js | 1 - .../unit/frontend/meta/author-url.test.js | 1 - .../test/unit/frontend/meta/blog-logo.test.js | 1 - .../unit/frontend/meta/context-object.test.js | 1 - .../unit/frontend/meta/cover-image.test.js | 1 - .../unit/frontend/meta/creator-url.test.js | 1 - .../unit/frontend/meta/description.test.js | 1 - .../frontend/meta/image-dimensions.test.js | 1 - .../test/unit/frontend/meta/keywords.test.js | 1 - .../unit/frontend/meta/modified-date.test.js | 1 - .../test/unit/frontend/meta/og-image.test.js | 1 - .../test/unit/frontend/meta/og-type.test.js | 1 - .../unit/frontend/meta/paginated-url.test.js | 1 - .../unit/frontend/meta/published-date.test.js | 1 - .../test/unit/frontend/meta/rss-url.test.js | 1 - .../test/unit/frontend/meta/schema.test.js | 1 - .../test/unit/frontend/meta/title.test.js | 1 - .../unit/frontend/meta/twitter-image.test.js | 1 - .../unit/frontend/services/apps/proxy.test.js | 1 - .../assets-minification/minifier.test.js | 1 - .../frontend/services/card-assets.test.js | 1 - .../frontend/services/data/checks.test.js | 1 - .../services/data/entry-lookup.test.js | 1 - .../services/rendering/context.test.js | 1 - .../rendering/format-response.test.js | 1 - .../services/rendering/templates.test.js | 1 - .../services/routing/bootstrap.test.js | 1 - .../routing/collection-router.test.js | 1 - .../routing/controllers/channel.test.js | 1 - .../routing/controllers/collection.test.js | 1 - .../routing/controllers/entry.test.js | 1 - .../routing/controllers/previews.test.js | 1 - .../routing/controllers/static.test.js | 1 - .../routing/middlewares/page-param.test.js | 1 - .../services/routing/parent-router.test.js | 1 - .../services/routing/registry.test.js | 1 - .../services/routing/rss-router.test.js | 1 - .../routing/static-routes-router.test.js | 1 - .../services/routing/taxonomy-router.test.js | 1 - .../unit/frontend/services/rss/cache.test.js | 1 - .../services/rss/generate-feed.test.js | 1 - .../frontend/services/rss/renderer.test.js | 1 - .../frontend/services/sitemap/manager.test.js | 1 - .../services/theme-engine/active.test.js | 1 - .../services/theme-engine/config.test.js | 1 - .../services/theme-engine/i18n.test.js | 1 - .../services/theme-engine/middleware.test.js | 1 - .../services/theme-engine/theme-i18n.test.js | 1 - .../test/unit/frontend/src/privacy.test.js | 1 - .../unit/frontend/src/url-attribution.test.js | 1 - .../unit/frontend/utils/frontend-apps.test.js | 1 - .../unit/frontend/utils/member-count.test.js | 1 - .../web/middleware/error-handler.test.js | 1 - .../web/middleware/handle-image-sizes.test.js | 1 - .../redirect-ghost-to-admin.test.js | 1 - .../web/middleware/serve-public-file.test.js | 1 - .../scheduling/scheduling-default.test.js | 1 - .../server/adapters/scheduling/utils.test.js | 1 - .../server/adapters/storage/index.test.js | 1 - .../storage/local-base-storage.test.js | 1 - .../storage/local-images-storage.test.js | 1 - .../test/unit/server/data/db/backup.test.js | 1 - .../unit/server/data/exporter/index.test.js | 1 - .../data/importer/handlers/image.test.js | 1 - .../data/importer/import-manager.test.js | 1 - .../importers/data/newsletters.test.js | 1 - .../importer/importers/data/posts.test.js | 1 - .../importer/importers/data/settings.test.js | 1 - .../unit/server/data/migrations/utils.test.js | 1 - .../unit/server/data/schema/commands.test.js | 1 - .../schema/fixtures/fixture-manager.test.js | 1 - .../unit/server/data/schema/schema.test.js | 1 - .../unit/server/lib/image/blog-icon.test.js | 1 - .../image/cached-image-size-from-url.test.js | 1 - .../unit/server/lib/image/gravatar.test.js | 1 - .../unit/server/lib/image/image-size.test.js | 1 - .../core/test/unit/server/lib/lexical.test.js | 1 - .../test/unit/server/lib/mobiledoc.test.js | 1 - .../server/lib/package-json/parse.test.js | 1 - .../unit/server/lib/package-json/read.test.js | 1 - .../unit/server/lib/request-external.test.js | 1 - .../test/unit/server/models/api-key.test.js | 1 - .../test/unit/server/models/base/crud.test.js | 1 - .../unit/server/models/base/index.test.js | 1 - .../unit/server/models/base/relations.test.js | 1 - .../test/unit/server/models/comment.test.js | 1 - .../models/custom-theme-setting.test.js | 1 - .../unit/server/models/integration.test.js | 1 - .../models/member-created-event.test.js | 1 - .../server/models/member-feedback.test.js | 1 - .../models/member-subscribe-event.test.js | 1 - .../test/unit/server/models/member.test.js | 1 - .../unit/server/models/newsletter.test.js | 1 - .../unit/server/models/permission.test.js | 1 - .../core/test/unit/server/models/post.test.js | 1 - .../test/unit/server/models/session.test.js | 1 - .../unit/server/models/set-is-roles.test.js | 1 - .../test/unit/server/models/settings.test.js | 1 - .../server/models/single-use-token.test.js | 1 - .../stripe-customer-subscription.test.js | 1 - .../models/subscription-created-event.test.js | 1 - .../core/test/unit/server/models/tag.test.js | 1 - .../core/test/unit/server/models/user.test.js | 1 - ghost/core/test/unit/server/notify.test.js | 1 - ghost/core/test/unit/server/overrides.test.js | 1 - .../adapter-manager/options-resolver.test.js | 1 - .../services/auth/api-key/admin.test.js | 1 - .../services/auth/api-key/content.test.js | 1 - .../services/auth/members/index.test.js | 1 - .../services/auth/session-from-token.test.js | 1 - .../services/auth/session/middleware.test.js | 1 - .../auth/session/session-service.test.js | 1 - .../services/auth/session/store.test.js | 1 - .../comments-service-emails-renderer.test.js | 1 - .../comments/comments-service-emails.test.js | 1 - .../email-analytics-service.test.js | 1 - .../node-renderers/header-v2-renderer.test.js | 1 - .../lib/dynamic-redirect-manager.test.js | 1 - .../link-click-repository.test.js | 1 - .../post-link-repository.test.js | 1 - .../server/services/mail/ghost-mailer.test.js | 1 - .../member-attribution/attribution.test.js | 1 - .../outbound-link-tagger.test.js | 1 - .../referrer-translator.test.js | 1 - .../member-welcome-email-renderer.test.js | 1 - .../last-seen-at-updater.test.js | 1 - .../members-csv-importer-stripe-utils.test.js | 1 - .../importer/members-csv-importer.test.js | 2 - .../controllers/router-controller.test.js | 1 - .../repositories/member-repository.test.js | 1 - .../services/geolocation-service.test.js | 1 - .../services/members/middleware.test.js | 1 - .../request-integrity-token-provider.test.js | 1 - .../services/members/stripe-connect.test.js | 1 - .../server/services/members/utils.test.js | 1 - .../notifications/notifications.test.js | 1 - .../offers/application/unique-checker.test.js | 1 - .../offers/domain/models/offer-amount.test.js | 1 - .../domain/models/offer-cadence.test.js | 1 - .../offers/domain/models/offer-code.test.js | 1 - .../domain/models/offer-currency.test.js | 1 - .../domain/models/offer-description.test.js | 1 - .../domain/models/offer-duration.test.js | 1 - .../offers/domain/models/offer-name.test.js | 1 - .../models/offer-redemption-type.test.js | 1 - .../offers/domain/models/offer-status.test.js | 1 - .../offers/domain/models/offer-title.test.js | 1 - .../offers/domain/models/offer-type.test.js | 1 - .../offers/domain/models/offer.test.js | 1 - .../domain/models/stripe-coupon.test.js | 1 - .../services/permissions/can-this.test.js | 1 - .../server/services/permissions/index.test.js | 1 - .../permissions/parse-context.test.js | 1 - .../services/permissions/providers.test.js | 1 - .../route-settings/route-settings.test.js | 1 - .../route-settings/settings-loader.test.js | 1 - .../services/route-settings/validate.test.js | 3 -- .../settings-helpers/settings-helpers.test.js | 1 - .../settings/default-settings-manager.test.js | 1 - .../settings/settings-bread-service.test.js | 1 - .../services/settings/settings-utils.test.js | 1 - .../services/staff/staff-service.test.js | 1 - .../server/services/stats/content.test.js | 1 - .../unit/server/services/stats/mrr.test.js | 1 - .../server/services/stripe/config.test.js | 1 - .../server/services/stripe/stripe-api.test.js | 1 - .../server/services/themes/loader.test.js | 1 - .../server/services/themes/validate.test.js | 1 - .../unit/server/services/update-check.test.js | 1 - .../services/url/local-file-cache.test.js | 1 - .../unit/server/services/url/queue.test.js | 1 - .../server/services/url/url-generator.test.js | 1 - .../server/services/url/url-service.test.js | 1 - .../unit/server/services/url/urls.test.js | 1 - .../services/verification-trigger.test.js | 1 - .../services/webhooks/webhook-service.test.js | 1 - .../unit/server/web/admin/controller.test.js | 1 - .../web/api/canary/content/middleware.test.js | 1 - .../server/web/api/middleware/cors.test.js | 1 - .../middleware/update-user-last-seen.test.js | 1 - .../parent/middleware/ghost-locals.test.js | 1 - .../web/parent/middleware/request-id.test.js | 1 - .../test/unit/shared/config/helpers.test.js | 1 - .../test/unit/shared/config/loader.test.js | 1 - .../test/unit/shared/config/utils.test.js | 1 - yarn.lock | 44 ------------------- 301 files changed, 347 deletions(-) diff --git a/ghost/core/package.json b/ghost/core/package.json index ddf078e8b3a..42688be14e8 100644 --- a/ghost/core/package.json +++ b/ghost/core/package.json @@ -257,7 +257,6 @@ "postcss": "8.5.6", "postcss-cli": "11.0.1", "rewire": "8.0.0", - "should": "13.2.3", "sinon": "18.0.1", "supertest": "6.3.4", "tmp": "0.2.5", diff --git a/ghost/core/test/e2e-api/admin/actions.test.js b/ghost/core/test/e2e-api/admin/actions.test.js index 052f1d16bf8..dc66646b174 100644 --- a/ghost/core/test/e2e-api/admin/actions.test.js +++ b/ghost/core/test/e2e-api/admin/actions.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const supertest = require('supertest'); const testUtils = require('../../utils'); diff --git a/ghost/core/test/e2e-api/admin/comments.test.js b/ghost/core/test/e2e-api/admin/comments.test.js index e4b96142c7b..330f7929baf 100644 --- a/ghost/core/test/e2e-api/admin/comments.test.js +++ b/ghost/core/test/e2e-api/admin/comments.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -require('should'); const ObjectId = require('bson-objectid').default; const { agentProvider, diff --git a/ghost/core/test/e2e-api/admin/files.test.js b/ghost/core/test/e2e-api/admin/files.test.js index c2edee48478..746b27e7549 100644 --- a/ghost/core/test/e2e-api/admin/files.test.js +++ b/ghost/core/test/e2e-api/admin/files.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const path = require('path'); const fs = require('fs-extra'); -const should = require('should'); const supertest = require('supertest'); const localUtils = require('./utils'); const config = require('../../../core/shared/config'); diff --git a/ghost/core/test/e2e-api/admin/integrations.test.js b/ghost/core/test/e2e-api/admin/integrations.test.js index 803268aefeb..964e81170ae 100644 --- a/ghost/core/test/e2e-api/admin/integrations.test.js +++ b/ghost/core/test/e2e-api/admin/integrations.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); const _ = require('lodash'); -const should = require('should'); const supertest = require('supertest'); const config = require('../../../core/shared/config'); const testUtils = require('../../utils'); diff --git a/ghost/core/test/e2e-api/admin/invites.test.js b/ghost/core/test/e2e-api/admin/invites.test.js index f84594c5a17..a8d2f52cefe 100644 --- a/ghost/core/test/e2e-api/admin/invites.test.js +++ b/ghost/core/test/e2e-api/admin/invites.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); -const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); const testUtils = require('../../utils'); diff --git a/ghost/core/test/e2e-api/admin/key-authentication.test.js b/ghost/core/test/e2e-api/admin/key-authentication.test.js index 0a35868fe61..c6cb2b38666 100644 --- a/ghost/core/test/e2e-api/admin/key-authentication.test.js +++ b/ghost/core/test/e2e-api/admin/key-authentication.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); -const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../utils'); const config = require('../../../core/shared/config'); diff --git a/ghost/core/test/e2e-api/admin/max-limit-cap.test.js b/ghost/core/test/e2e-api/admin/max-limit-cap.test.js index 536c4cf1b12..66c6cf89c63 100644 --- a/ghost/core/test/e2e-api/admin/max-limit-cap.test.js +++ b/ghost/core/test/e2e-api/admin/max-limit-cap.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {agentProvider, fixtureManager} = require('../../utils/e2e-framework'); -const should = require('should'); const sinon = require('sinon'); const db = require('../../../core/server/data/db'); const ObjectId = require('bson-objectid').default; diff --git a/ghost/core/test/e2e-api/admin/media.test.js b/ghost/core/test/e2e-api/admin/media.test.js index 68b4483737a..817415bac47 100644 --- a/ghost/core/test/e2e-api/admin/media.test.js +++ b/ghost/core/test/e2e-api/admin/media.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const path = require('path'); const fs = require('fs-extra'); -const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); const localUtils = require('./utils'); diff --git a/ghost/core/test/e2e-api/admin/members-importer.test.js b/ghost/core/test/e2e-api/admin/members-importer.test.js index d603ffd1f31..222a8b5e67f 100644 --- a/ghost/core/test/e2e-api/admin/members-importer.test.js +++ b/ghost/core/test/e2e-api/admin/members-importer.test.js @@ -1,7 +1,6 @@ const path = require('path'); const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); -const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../utils'); const localUtils = require('./utils'); diff --git a/ghost/core/test/e2e-api/admin/members.test.js b/ghost/core/test/e2e-api/admin/members.test.js index 80989380351..1716ca4a1b9 100644 --- a/ghost/core/test/e2e-api/admin/members.test.js +++ b/ghost/core/test/e2e-api/admin/members.test.js @@ -7,7 +7,6 @@ const assert = require('node:assert/strict'); const {assertExists, assertArrayContainsDeep, assertObjectMatches, assertArrayMatchesWithoutOrder} = require('../../utils/assertions'); const nock = require('nock'); const sinon = require('sinon'); -const should = require('should'); const testUtils = require('../../utils'); const configUtils = require('../../utils/config-utils'); diff --git a/ghost/core/test/e2e-api/admin/oembed.test.js b/ghost/core/test/e2e-api/admin/oembed.test.js index e9b6a4ca54f..5e0c855c627 100644 --- a/ghost/core/test/e2e-api/admin/oembed.test.js +++ b/ghost/core/test/e2e-api/admin/oembed.test.js @@ -2,7 +2,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); const nock = require('nock'); const sinon = require('sinon'); -const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../utils/index'); const config = require('../../../core/shared/config/index'); diff --git a/ghost/core/test/e2e-api/admin/pages-legacy.test.js b/ghost/core/test/e2e-api/admin/pages-legacy.test.js index 5f7af928f9c..b36408d9041 100644 --- a/ghost/core/test/e2e-api/admin/pages-legacy.test.js +++ b/ghost/core/test/e2e-api/admin/pages-legacy.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); -const should = require('should'); const supertest = require('supertest'); const moment = require('moment'); const _ = require('lodash'); diff --git a/ghost/core/test/e2e-api/admin/posts-bulk.test.js b/ghost/core/test/e2e-api/admin/posts-bulk.test.js index 38fa117d8c0..fd00060d5c8 100644 --- a/ghost/core/test/e2e-api/admin/posts-bulk.test.js +++ b/ghost/core/test/e2e-api/admin/posts-bulk.test.js @@ -1,4 +1,3 @@ -const should = require('should'); const DomainEvents = require('@tryghost/domain-events'); const {mobiledocToLexical} = require('@tryghost/kg-converters'); const {agentProvider, fixtureManager, mockManager} = require('../../utils/e2e-framework'); diff --git a/ghost/core/test/e2e-api/admin/posts-legacy.test.js b/ghost/core/test/e2e-api/admin/posts-legacy.test.js index 61f7e845fa2..83cccdef750 100644 --- a/ghost/core/test/e2e-api/admin/posts-legacy.test.js +++ b/ghost/core/test/e2e-api/admin/posts-legacy.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); -const should = require('should'); const nock = require('nock'); const path = require('path'); const supertest = require('supertest'); diff --git a/ghost/core/test/e2e-api/admin/redirects.test.js b/ghost/core/test/e2e-api/admin/redirects.test.js index 4edbca0fc1e..a86fbfca1d5 100644 --- a/ghost/core/test/e2e-api/admin/redirects.test.js +++ b/ghost/core/test/e2e-api/admin/redirects.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const supertest = require('supertest'); const fs = require('fs-extra'); const path = require('path'); diff --git a/ghost/core/test/e2e-api/admin/snippets.test.js b/ghost/core/test/e2e-api/admin/snippets.test.js index d52b70f7f0d..aaf6adad2c9 100644 --- a/ghost/core/test/e2e-api/admin/snippets.test.js +++ b/ghost/core/test/e2e-api/admin/snippets.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -require('should'); const sinon = require('sinon'); const {agentProvider, fixtureManager, matchers} = require('../../utils/e2e-framework'); const {anyContentVersion, anyEtag, anyLocationFor, anyObjectId, anyISODateTime, anyErrorId} = matchers; diff --git a/ghost/core/test/e2e-api/admin/storage-adapter-switching.test.js b/ghost/core/test/e2e-api/admin/storage-adapter-switching.test.js index 78f5380db66..72a24a66c80 100644 --- a/ghost/core/test/e2e-api/admin/storage-adapter-switching.test.js +++ b/ghost/core/test/e2e-api/admin/storage-adapter-switching.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const {agentProvider, fixtureManager} = require('../../utils/e2e-framework'); const config = require('../../../core/shared/config'); diff --git a/ghost/core/test/e2e-api/admin/tags.test.js b/ghost/core/test/e2e-api/admin/tags.test.js index bad90ac227b..3133c2da1d6 100644 --- a/ghost/core/test/e2e-api/admin/tags.test.js +++ b/ghost/core/test/e2e-api/admin/tags.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const supertest = require('supertest'); const testUtils = require('../../utils'); diff --git a/ghost/core/test/e2e-api/content/key-authentication.test.js b/ghost/core/test/e2e-api/content/key-authentication.test.js index c9cb2974abd..6a18ab84d19 100644 --- a/ghost/core/test/e2e-api/content/key-authentication.test.js +++ b/ghost/core/test/e2e-api/content/key-authentication.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../utils'); const localUtils = require('./utils'); diff --git a/ghost/core/test/e2e-api/content/max-limit-cap.test.js b/ghost/core/test/e2e-api/content/max-limit-cap.test.js index 81e0e7fd973..2874d7ce9dc 100644 --- a/ghost/core/test/e2e-api/content/max-limit-cap.test.js +++ b/ghost/core/test/e2e-api/content/max-limit-cap.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {agentProvider, fixtureManager} = require('../../utils/e2e-framework'); -const should = require('should'); const sinon = require('sinon'); const sharedMiddleware = require('../../../core/server/web/shared/middleware'); diff --git a/ghost/core/test/e2e-api/content/tags.test.js b/ghost/core/test/e2e-api/content/tags.test.js index 5fd6f974241..d6d80e07be7 100644 --- a/ghost/core/test/e2e-api/content/tags.test.js +++ b/ghost/core/test/e2e-api/content/tags.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); -const should = require('should'); const supertest = require('supertest'); const _ = require('lodash'); const url = require('url'); diff --git a/ghost/core/test/e2e-api/members-comments/comments.test.js b/ghost/core/test/e2e-api/members-comments/comments.test.js index 72d0fa372c6..0ee73db892f 100644 --- a/ghost/core/test/e2e-api/members-comments/comments.test.js +++ b/ghost/core/test/e2e-api/members-comments/comments.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {agentProvider, mockManager, fixtureManager, matchers, configUtils, dbUtils} = require('../../utils/e2e-framework'); const {nullable, anyEtag, anyObjectId, anyLocationFor, anyISODateTime, anyErrorId, anyUuid, anyNumber, anyBoolean, stringMatching} = matchers; -const should = require('should'); const models = require('../../../core/server/models'); const moment = require('moment-timezone'); const settingsCache = require('../../../core/shared/settings-cache'); diff --git a/ghost/core/test/e2e-api/members-comments/max-limit-cap.test.js b/ghost/core/test/e2e-api/members-comments/max-limit-cap.test.js index a05ce679db9..95cebaf695b 100644 --- a/ghost/core/test/e2e-api/members-comments/max-limit-cap.test.js +++ b/ghost/core/test/e2e-api/members-comments/max-limit-cap.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {agentProvider, fixtureManager} = require('../../utils/e2e-framework'); -const should = require('should'); const sinon = require('sinon'); const settingsCache = require('../../../core/shared/settings-cache'); const sharedMiddleware = require('../../../core/server/web/shared/middleware'); diff --git a/ghost/core/test/e2e-api/members/create-stripe-checkout-session.test.js b/ghost/core/test/e2e-api/members/create-stripe-checkout-session.test.js index 5369842a878..9dfe28e891b 100644 --- a/ghost/core/test/e2e-api/members/create-stripe-checkout-session.test.js +++ b/ghost/core/test/e2e-api/members/create-stripe-checkout-session.test.js @@ -2,7 +2,6 @@ const assert = require('node:assert/strict'); const querystring = require('querystring'); const {agentProvider, mockManager, fixtureManager, matchers} = require('../../utils/e2e-framework'); const nock = require('nock'); -const should = require('should'); const models = require('../../../core/server/models'); const urlService = require('../../../core/server/services/url'); diff --git a/ghost/core/test/e2e-api/members/middleware.test.js b/ghost/core/test/e2e-api/members/middleware.test.js index df821558470..e6145e0ea84 100644 --- a/ghost/core/test/e2e-api/members/middleware.test.js +++ b/ghost/core/test/e2e-api/members/middleware.test.js @@ -3,7 +3,6 @@ const crypto = require('crypto'); const {agentProvider, mockManager, fixtureManager, matchers, configUtils} = require('../../utils/e2e-framework'); const {anyEtag, anyObjectId, anyUuid, anyISODateTime, stringMatching} = matchers; const models = require('../../../core/server/models'); -const should = require('should'); const sinon = require('sinon'); const settingsHelpers = require('../../../core/server/services/settings-helpers'); diff --git a/ghost/core/test/e2e-frontend/custom-routes.test.js b/ghost/core/test/e2e-frontend/custom-routes.test.js index 957c7492486..5673d2c2612 100644 --- a/ghost/core/test/e2e-frontend/custom-routes.test.js +++ b/ghost/core/test/e2e-frontend/custom-routes.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../utils/assertions'); -const should = require('should'); const supertest = require('supertest'); const path = require('path'); const moment = require('moment'); diff --git a/ghost/core/test/e2e-frontend/email-routes.test.js b/ghost/core/test/e2e-frontend/email-routes.test.js index 9ed6b1abdf5..b95214adb23 100644 --- a/ghost/core/test/e2e-frontend/email-routes.test.js +++ b/ghost/core/test/e2e-frontend/email-routes.test.js @@ -4,7 +4,6 @@ // But then again testing real code, rather than mock code, might be more useful... const assert = require('node:assert/strict'); const {assertExists} = require('../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const supertest = require('supertest'); const cheerio = require('cheerio'); diff --git a/ghost/core/test/e2e-frontend/helpers/next-post.test.js b/ghost/core/test/e2e-frontend/helpers/next-post.test.js index 7bfc5ce4fba..0ba40e31ded 100644 --- a/ghost/core/test/e2e-frontend/helpers/next-post.test.js +++ b/ghost/core/test/e2e-frontend/helpers/next-post.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../utils'); const models = require('../../../core/server/models/index'); diff --git a/ghost/core/test/e2e-frontend/member-stats.test.js b/ghost/core/test/e2e-frontend/member-stats.test.js index 77b82e5b954..56e8cc13475 100644 --- a/ghost/core/test/e2e-frontend/member-stats.test.js +++ b/ghost/core/test/e2e-frontend/member-stats.test.js @@ -1,5 +1,4 @@ const {assertExists} = require('../utils/assertions'); -const should = require('should'); const {getMemberStats} = require('../../core/frontend/utils/member-count.js'); describe('Front-end member stats ', function () { diff --git a/ghost/core/test/e2e-server/admin.test.js b/ghost/core/test/e2e-server/admin.test.js index d97890041fb..b3f82ef8b17 100644 --- a/ghost/core/test/e2e-server/admin.test.js +++ b/ghost/core/test/e2e-server/admin.test.js @@ -5,7 +5,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../utils/assertions'); -const should = require('should'); const path = require('path'); const fs = require('fs'); diff --git a/ghost/core/test/integration/exporter/exporter.test.js b/ghost/core/test/integration/exporter/exporter.test.js index dc4ab4e6333..a4adac887a7 100644 --- a/ghost/core/test/integration/exporter/exporter.test.js +++ b/ghost/core/test/integration/exporter/exporter.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../utils'); const _ = require('lodash'); diff --git a/ghost/core/test/integration/importer/v1.test.js b/ghost/core/test/integration/importer/v1.test.js index 4fe58933709..d78eb251303 100644 --- a/ghost/core/test/integration/importer/v1.test.js +++ b/ghost/core/test/integration/importer/v1.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const testUtils = require('../../utils'); const {exportedBodyV1} = require('../../utils/fixtures/export/body-generator'); diff --git a/ghost/core/test/integration/importer/v2.test.js b/ghost/core/test/integration/importer/v2.test.js index 430f8564a70..aa84235a90f 100644 --- a/ghost/core/test/integration/importer/v2.test.js +++ b/ghost/core/test/integration/importer/v2.test.js @@ -1,4 +1,3 @@ -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../utils'); const moment = require('moment-timezone'); diff --git a/ghost/core/test/integration/migrations/nullable-utils.test.js b/ghost/core/test/integration/migrations/nullable-utils.test.js index 185050cc006..ac8803101cd 100644 --- a/ghost/core/test/integration/migrations/nullable-utils.test.js +++ b/ghost/core/test/integration/migrations/nullable-utils.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../utils'); const dbUtils = require('../../utils/db-utils'); diff --git a/ghost/core/test/integration/services/last-seen-at-updater.test.js b/ghost/core/test/integration/services/last-seen-at-updater.test.js index 9c356f42678..43803a47ae0 100644 --- a/ghost/core/test/integration/services/last-seen-at-updater.test.js +++ b/ghost/core/test/integration/services/last-seen-at-updater.test.js @@ -1,4 +1,3 @@ -require('should'); const {agentProvider, fixtureManager, mockManager} = require('../../utils/e2e-framework'); const models = require('../../../core/server/models'); const assert = require('node:assert/strict'); diff --git a/ghost/core/test/integration/url-service.test.js b/ghost/core/test/integration/url-service.test.js index b13abddce5b..c8400f25e07 100644 --- a/ghost/core/test/integration/url-service.test.js +++ b/ghost/core/test/integration/url-service.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../utils'); const configUtils = require('../utils/config-utils'); diff --git a/ghost/core/test/legacy/api/admin/identities.test.js b/ghost/core/test/legacy/api/admin/identities.test.js index e127a20bff8..ce1171f4591 100644 --- a/ghost/core/test/legacy/api/admin/identities.test.js +++ b/ghost/core/test/legacy/api/admin/identities.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const supertest = require('supertest'); const jwt = require('jsonwebtoken'); const jwksClient = require('jwks-rsa'); diff --git a/ghost/core/test/legacy/api/admin/images.test.js b/ghost/core/test/legacy/api/admin/images.test.js index 2a26de462e7..0e7336d1906 100644 --- a/ghost/core/test/legacy/api/admin/images.test.js +++ b/ghost/core/test/legacy/api/admin/images.test.js @@ -1,6 +1,5 @@ const path = require('path'); const fs = require('fs-extra'); -const should = require('should'); const supertest = require('supertest'); const localUtils = require('./utils'); const config = require('../../../../core/shared/config'); diff --git a/ghost/core/test/legacy/api/admin/members-importer.test.js b/ghost/core/test/legacy/api/admin/members-importer.test.js index 8cf8ed933b9..9ffd03cb3e3 100644 --- a/ghost/core/test/legacy/api/admin/members-importer.test.js +++ b/ghost/core/test/legacy/api/admin/members-importer.test.js @@ -1,5 +1,4 @@ const path = require('path'); -const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../../utils'); const localUtils = require('./utils'); diff --git a/ghost/core/test/legacy/api/admin/members-signin-url.test.js b/ghost/core/test/legacy/api/admin/members-signin-url.test.js index d2e4b11f33e..57098bf4709 100644 --- a/ghost/core/test/legacy/api/admin/members-signin-url.test.js +++ b/ghost/core/test/legacy/api/admin/members-signin-url.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../../utils'); const localUtils = require('./utils'); diff --git a/ghost/core/test/legacy/api/admin/pages.test.js b/ghost/core/test/legacy/api/admin/pages.test.js index ba7c0f24fd3..89f773c1748 100644 --- a/ghost/core/test/legacy/api/admin/pages.test.js +++ b/ghost/core/test/legacy/api/admin/pages.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../../utils'); const config = require('../../../../core/shared/config'); diff --git a/ghost/core/test/legacy/api/admin/posts.test.js b/ghost/core/test/legacy/api/admin/posts.test.js index 73c0df8f49a..c1d25509dab 100644 --- a/ghost/core/test/legacy/api/admin/posts.test.js +++ b/ghost/core/test/legacy/api/admin/posts.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); const _ = require('lodash'); -const should = require('should'); const supertest = require('supertest'); const ObjectId = require('bson-objectid').default; const moment = require('moment-timezone'); diff --git a/ghost/core/test/legacy/api/admin/redirects.test.js b/ghost/core/test/legacy/api/admin/redirects.test.js index fe96f1e46da..ff9884eafff 100644 --- a/ghost/core/test/legacy/api/admin/redirects.test.js +++ b/ghost/core/test/legacy/api/admin/redirects.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const supertest = require('supertest'); const fs = require('fs-extra'); const path = require('path'); diff --git a/ghost/core/test/legacy/api/admin/schedules.test.js b/ghost/core/test/legacy/api/admin/schedules.test.js index 99f140d48c7..a78aba131c5 100644 --- a/ghost/core/test/legacy/api/admin/schedules.test.js +++ b/ghost/core/test/legacy/api/admin/schedules.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); const _ = require('lodash'); -const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); const moment = require('moment-timezone'); diff --git a/ghost/core/test/legacy/api/admin/settings.test.js b/ghost/core/test/legacy/api/admin/settings.test.js index 63a8b3fd5d3..8e7b068d6af 100644 --- a/ghost/core/test/legacy/api/admin/settings.test.js +++ b/ghost/core/test/legacy/api/admin/settings.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const supertest = require('supertest'); const config = require('../../../../core/shared/config'); const testUtils = require('../../../utils'); diff --git a/ghost/core/test/legacy/api/admin/users.test.js b/ghost/core/test/legacy/api/admin/users.test.js index 2e5b2049930..bfac8811b9a 100644 --- a/ghost/core/test/legacy/api/admin/users.test.js +++ b/ghost/core/test/legacy/api/admin/users.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const supertest = require('supertest'); const ObjectId = require('bson-objectid').default; const testUtils = require('../../../utils'); diff --git a/ghost/core/test/legacy/api/admin/webhooks.test.js b/ghost/core/test/legacy/api/admin/webhooks.test.js index ea73105a39e..85e1e6dfe15 100644 --- a/ghost/core/test/legacy/api/admin/webhooks.test.js +++ b/ghost/core/test/legacy/api/admin/webhooks.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../../utils'); const config = require('../../../../core/shared/config'); diff --git a/ghost/core/test/legacy/api/content/authors.test.js b/ghost/core/test/legacy/api/content/authors.test.js index c36fc85ae62..f92ab4f1e7a 100644 --- a/ghost/core/test/legacy/api/content/authors.test.js +++ b/ghost/core/test/legacy/api/content/authors.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../utils'); diff --git a/ghost/core/test/legacy/api/content/pages.test.js b/ghost/core/test/legacy/api/content/pages.test.js index 2323e00b5ad..aec0d96ff17 100644 --- a/ghost/core/test/legacy/api/content/pages.test.js +++ b/ghost/core/test/legacy/api/content/pages.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../../utils'); const localUtils = require('./utils'); diff --git a/ghost/core/test/legacy/api/content/posts.test.js b/ghost/core/test/legacy/api/content/posts.test.js index 28e029f1c6d..a80309f800e 100644 --- a/ghost/core/test/legacy/api/content/posts.test.js +++ b/ghost/core/test/legacy/api/content/posts.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const supertest = require('supertest'); const _ = require('lodash'); const testUtils = require('../../../utils'); diff --git a/ghost/core/test/legacy/api/content/tags.test.js b/ghost/core/test/legacy/api/content/tags.test.js index 3ded53801c0..c454daa3d59 100644 --- a/ghost/core/test/legacy/api/content/tags.test.js +++ b/ghost/core/test/legacy/api/content/tags.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const supertest = require('supertest'); const _ = require('lodash'); const localUtils = require('./utils'); diff --git a/ghost/core/test/legacy/mock-express-style/api-vs-frontend.test.js b/ghost/core/test/legacy/mock-express-style/api-vs-frontend.test.js index 6c4e8ae85e1..0db1f80723f 100644 --- a/ghost/core/test/legacy/mock-express-style/api-vs-frontend.test.js +++ b/ghost/core/test/legacy/mock-express-style/api-vs-frontend.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const cheerio = require('cheerio'); const testUtils = require('../../utils'); diff --git a/ghost/core/test/legacy/mock-express-style/parent-app-vhosts.test.js b/ghost/core/test/legacy/mock-express-style/parent-app-vhosts.test.js index a9469818cab..593157d9d79 100644 --- a/ghost/core/test/legacy/mock-express-style/parent-app-vhosts.test.js +++ b/ghost/core/test/legacy/mock-express-style/parent-app-vhosts.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const path = require('path'); diff --git a/ghost/core/test/legacy/models/base/listeners.test.js b/ghost/core/test/legacy/models/base/listeners.test.js index d1757410c8a..65730e663b8 100644 --- a/ghost/core/test/legacy/models/base/listeners.test.js +++ b/ghost/core/test/legacy/models/base/listeners.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const moment = require('moment-timezone'); const rewire = require('rewire'); diff --git a/ghost/core/test/legacy/models/model-member-stripe-customer.test.js b/ghost/core/test/legacy/models/model-member-stripe-customer.test.js index 3c20c8be87d..6ccb6fb2354 100644 --- a/ghost/core/test/legacy/models/model-member-stripe-customer.test.js +++ b/ghost/core/test/legacy/models/model-member-stripe-customer.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); -const should = require('should'); const {Member} = require('../../../core/server/models/member'); const {MemberStripeCustomer} = require('../../../core/server/models/member-stripe-customer'); const {Product} = require('../../../core/server/models/product'); diff --git a/ghost/core/test/legacy/models/model-members.test.js b/ghost/core/test/legacy/models/model-members.test.js index 1b5560c6a84..5dc8297fd39 100644 --- a/ghost/core/test/legacy/models/model-members.test.js +++ b/ghost/core/test/legacy/models/model-members.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); -const should = require('should'); const BaseModel = require('../../../core/server/models/base'); const {Label} = require('../../../core/server/models/label'); const {Product} = require('../../../core/server/models/product'); diff --git a/ghost/core/test/legacy/models/model-newsletters.test.js b/ghost/core/test/legacy/models/model-newsletters.test.js index b5cadecff16..4f564fdb689 100644 --- a/ghost/core/test/legacy/models/model-newsletters.test.js +++ b/ghost/core/test/legacy/models/model-newsletters.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../utils'); const configUtils = require('../../utils/config-utils'); diff --git a/ghost/core/test/legacy/models/model-posts.test.js b/ghost/core/test/legacy/models/model-posts.test.js index 00e925ef444..d1971288808 100644 --- a/ghost/core/test/legacy/models/model-posts.test.js +++ b/ghost/core/test/legacy/models/model-posts.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists, assertObjectMatches} = require('../../utils/assertions'); const errors = require('@tryghost/errors'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../utils'); const moment = require('moment'); diff --git a/ghost/core/test/legacy/models/model-settings.test.js b/ghost/core/test/legacy/models/model-settings.test.js index 0cceadd6ca0..5b9c81b7626 100644 --- a/ghost/core/test/legacy/models/model-settings.test.js +++ b/ghost/core/test/legacy/models/model-settings.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const testUtils = require('../../utils'); const db = require('../../../core/server/data/db'); diff --git a/ghost/core/test/legacy/models/model-snippets.test.js b/ghost/core/test/legacy/models/model-snippets.test.js index 694ff812651..a13724001b9 100644 --- a/ghost/core/test/legacy/models/model-snippets.test.js +++ b/ghost/core/test/legacy/models/model-snippets.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../utils'); const configUtils = require('../../utils/config-utils'); diff --git a/ghost/core/test/legacy/models/model-stripe-customer-subscription.test.js b/ghost/core/test/legacy/models/model-stripe-customer-subscription.test.js index 7cbcea90463..c029cb5b6d3 100644 --- a/ghost/core/test/legacy/models/model-stripe-customer-subscription.test.js +++ b/ghost/core/test/legacy/models/model-stripe-customer-subscription.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); -const should = require('should'); const {Member} = require('../../../core/server/models/member'); const {MemberStripeCustomer} = require('../../../core/server/models/member-stripe-customer'); const {Product} = require('../../../core/server/models/product'); diff --git a/ghost/core/test/legacy/models/model-tags.test.js b/ghost/core/test/legacy/models/model-tags.test.js index 3e745543e54..3eccad7df35 100644 --- a/ghost/core/test/legacy/models/model-tags.test.js +++ b/ghost/core/test/legacy/models/model-tags.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../utils'); const configUtils = require('../../utils/config-utils'); diff --git a/ghost/core/test/legacy/models/model-users.test.js b/ghost/core/test/legacy/models/model-users.test.js index 2774520edec..949a3bdd90a 100644 --- a/ghost/core/test/legacy/models/model-users.test.js +++ b/ghost/core/test/legacy/models/model-users.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); const errors = require('@tryghost/errors'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../utils'); const config = require('../../../core/shared/config'); diff --git a/ghost/core/test/legacy/site/dynamic-routing.test.js b/ghost/core/test/legacy/site/dynamic-routing.test.js index 86a8c53fd1e..a17c6aeca97 100644 --- a/ghost/core/test/legacy/site/dynamic-routing.test.js +++ b/ghost/core/test/legacy/site/dynamic-routing.test.js @@ -4,7 +4,6 @@ // tested with the unit tests const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); -const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); const moment = require('moment'); diff --git a/ghost/core/test/legacy/site/frontend.test.js b/ghost/core/test/legacy/site/frontend.test.js index 4996432d3d7..f3754de2c73 100644 --- a/ghost/core/test/legacy/site/frontend.test.js +++ b/ghost/core/test/legacy/site/frontend.test.js @@ -4,7 +4,6 @@ // But then again testing real code, rather than mock code, might be more useful... const assert = require('node:assert/strict'); const {assertExists} = require('../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const supertest = require('supertest'); diff --git a/ghost/core/test/unit/api/canary/session.test.js b/ghost/core/test/unit/api/canary/session.test.js index 4c2ddecc1f8..b3cabe55c0f 100644 --- a/ghost/core/test/unit/api/canary/session.test.js +++ b/ghost/core/test/unit/api/canary/session.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const {UnauthorizedError} = require('@tryghost/errors'); diff --git a/ghost/core/test/unit/api/canary/utils/index.test.js b/ghost/core/test/unit/api/canary/utils/index.test.js index 865bf0114cf..cd28da2b297 100644 --- a/ghost/core/test/unit/api/canary/utils/index.test.js +++ b/ghost/core/test/unit/api/canary/utils/index.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const utils = require('../../../../../core/server/api/endpoints/utils'); diff --git a/ghost/core/test/unit/api/canary/utils/serializers/input/members.test.js b/ghost/core/test/unit/api/canary/utils/serializers/input/members.test.js index d4b4af19d7f..4b05fc942d6 100644 --- a/ghost/core/test/unit/api/canary/utils/serializers/input/members.test.js +++ b/ghost/core/test/unit/api/canary/utils/serializers/input/members.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const serializers = require('../../../../../../../core/server/api/endpoints/utils/serializers'); describe('Unit: endpoints/utils/serializers/input/members', function () { diff --git a/ghost/core/test/unit/api/canary/utils/serializers/output/all.test.js b/ghost/core/test/unit/api/canary/utils/serializers/output/all.test.js index a42a765d44e..d698eb7205d 100644 --- a/ghost/core/test/unit/api/canary/utils/serializers/output/all.test.js +++ b/ghost/core/test/unit/api/canary/utils/serializers/output/all.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../../../utils/assertions'); -const should = require('should'); const serializers = require('../../../../../../../core/server/api/endpoints/utils/serializers'); describe('Unit: endpoints/utils/serializers/output/all', function () { diff --git a/ghost/core/test/unit/api/canary/utils/serializers/output/mapper.test.js b/ghost/core/test/unit/api/canary/utils/serializers/output/mapper.test.js index 9717636b46b..904bbe5f32f 100644 --- a/ghost/core/test/unit/api/canary/utils/serializers/output/mapper.test.js +++ b/ghost/core/test/unit/api/canary/utils/serializers/output/mapper.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../../utils'); const dateUtil = require('../../../../../../../core/server/api/endpoints/utils/serializers/output/utils/date'); diff --git a/ghost/core/test/unit/api/canary/utils/serializers/output/members.test.js b/ghost/core/test/unit/api/canary/utils/serializers/output/members.test.js index d2d82ef9be8..adc52dd8332 100644 --- a/ghost/core/test/unit/api/canary/utils/serializers/output/members.test.js +++ b/ghost/core/test/unit/api/canary/utils/serializers/output/members.test.js @@ -1,5 +1,4 @@ const {assertExists} = require('../../../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../../utils'); const labs = require('../../../../../../../core/shared/labs'); diff --git a/ghost/core/test/unit/frontend/apps/private-blogging/controller.test.js b/ghost/core/test/unit/frontend/apps/private-blogging/controller.test.js index ccf0bb13219..e535ccef911 100644 --- a/ghost/core/test/unit/frontend/apps/private-blogging/controller.test.js +++ b/ghost/core/test/unit/frontend/apps/private-blogging/controller.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const path = require('path'); const configUtils = require('../../../../utils/config-utils'); diff --git a/ghost/core/test/unit/frontend/apps/private-blogging/input-password.test.js b/ghost/core/test/unit/frontend/apps/private-blogging/input-password.test.js index 6d36f92046f..ed2c9aa87bb 100644 --- a/ghost/core/test/unit/frontend/apps/private-blogging/input-password.test.js +++ b/ghost/core/test/unit/frontend/apps/private-blogging/input-password.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); // We use the name input_password to match the helper for consistency: -const should = require('should'); // Stuff we are testing const input_password = require('../../../../../core/frontend/apps/private-blogging/lib/helpers/input_password'); diff --git a/ghost/core/test/unit/frontend/apps/private-blogging/middleware.test.js b/ghost/core/test/unit/frontend/apps/private-blogging/middleware.test.js index a134f38e48d..8066f8743ca 100644 --- a/ghost/core/test/unit/frontend/apps/private-blogging/middleware.test.js +++ b/ghost/core/test/unit/frontend/apps/private-blogging/middleware.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const errors = require('@tryghost/errors'); -const should = require('should'); const sinon = require('sinon'); const crypto = require('crypto'); const fs = require('fs-extra'); diff --git a/ghost/core/test/unit/frontend/helpers/authors.test.js b/ghost/core/test/unit/frontend/helpers/authors.test.js index 684fdfa0542..41b717f6bd3 100644 --- a/ghost/core/test/unit/frontend/helpers/authors.test.js +++ b/ghost/core/test/unit/frontend/helpers/authors.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const urlService = require('../../../../core/server/services/url'); const authorsHelper = require('../../../../core/frontend/helpers/authors'); diff --git a/ghost/core/test/unit/frontend/helpers/body-class.test.js b/ghost/core/test/unit/frontend/helpers/body-class.test.js index e7e372334dd..c328b04bcc5 100644 --- a/ghost/core/test/unit/frontend/helpers/body-class.test.js +++ b/ghost/core/test/unit/frontend/helpers/body-class.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const themeList = require('../../../../core/server/services/themes/list'); const sinon = require('sinon'); diff --git a/ghost/core/test/unit/frontend/helpers/comment-count.test.js b/ghost/core/test/unit/frontend/helpers/comment-count.test.js index 81039fae0b5..60944cd9e8e 100644 --- a/ghost/core/test/unit/frontend/helpers/comment-count.test.js +++ b/ghost/core/test/unit/frontend/helpers/comment-count.test.js @@ -1,4 +1,3 @@ -const should = require('should'); const sinon = require('sinon'); const configUtils = require('../../../utils/config-utils'); const {mockManager} = require('../../../utils/e2e-framework'); diff --git a/ghost/core/test/unit/frontend/helpers/comments.test.js b/ghost/core/test/unit/frontend/helpers/comments.test.js index 843d65b2913..ece96dfa6e9 100644 --- a/ghost/core/test/unit/frontend/helpers/comments.test.js +++ b/ghost/core/test/unit/frontend/helpers/comments.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const configUtils = require('../../../utils/config-utils'); const {mockManager} = require('../../../utils/e2e-framework'); diff --git a/ghost/core/test/unit/frontend/helpers/concat.test.js b/ghost/core/test/unit/frontend/helpers/concat.test.js index 7f3f9ad455e..3660533859b 100644 --- a/ghost/core/test/unit/frontend/helpers/concat.test.js +++ b/ghost/core/test/unit/frontend/helpers/concat.test.js @@ -1,4 +1,3 @@ -const should = require('should'); const handlebars = require('../../../../core/frontend/services/theme-engine/engine').handlebars; const concat = require('../../../../core/frontend/helpers/concat'); diff --git a/ghost/core/test/unit/frontend/helpers/content-api-key.test.js b/ghost/core/test/unit/frontend/helpers/content-api-key.test.js index db228d64a5a..baff5530285 100644 --- a/ghost/core/test/unit/frontend/helpers/content-api-key.test.js +++ b/ghost/core/test/unit/frontend/helpers/content-api-key.test.js @@ -2,7 +2,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); const proxy = require('../../../../core/frontend/services/proxy'); const {getFrontendKey} = proxy; -const should = require('should'); // Stuff we are testing const content_api_key = require('../../../../core/frontend/helpers/content_api_key'); diff --git a/ghost/core/test/unit/frontend/helpers/content-api-url.test.js b/ghost/core/test/unit/frontend/helpers/content-api-url.test.js index 207a73c978f..2f1675477bc 100644 --- a/ghost/core/test/unit/frontend/helpers/content-api-url.test.js +++ b/ghost/core/test/unit/frontend/helpers/content-api-url.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const configUtils = require('../../../utils/config-utils'); diff --git a/ghost/core/test/unit/frontend/helpers/content.test.js b/ghost/core/test/unit/frontend/helpers/content.test.js index b43ee220ada..c6c6e402187 100644 --- a/ghost/core/test/unit/frontend/helpers/content.test.js +++ b/ghost/core/test/unit/frontend/helpers/content.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const hbs = require('../../../../core/frontend/services/theme-engine/engine'); const configUtils = require('../../../utils/config-utils'); const path = require('path'); diff --git a/ghost/core/test/unit/frontend/helpers/date.test.js b/ghost/core/test/unit/frontend/helpers/date.test.js index e2e00d35432..3cbe5c1b1b4 100644 --- a/ghost/core/test/unit/frontend/helpers/date.test.js +++ b/ghost/core/test/unit/frontend/helpers/date.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); const sinon = require('sinon'); -const should = require('should'); // Stuff we are testing const date = require('../../../../core/frontend/helpers/date'); diff --git a/ghost/core/test/unit/frontend/helpers/encode.test.js b/ghost/core/test/unit/frontend/helpers/encode.test.js index 51823ce1c4b..3cf6871d274 100644 --- a/ghost/core/test/unit/frontend/helpers/encode.test.js +++ b/ghost/core/test/unit/frontend/helpers/encode.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); // Stuff we are testing const encode = require('../../../../core/frontend/helpers/encode'); diff --git a/ghost/core/test/unit/frontend/helpers/excerpt.test.js b/ghost/core/test/unit/frontend/helpers/excerpt.test.js index 09754ef1e1d..99340917f1c 100644 --- a/ghost/core/test/unit/frontend/helpers/excerpt.test.js +++ b/ghost/core/test/unit/frontend/helpers/excerpt.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); // Stuff we are testing const excerptHelper = require('../../../../core/frontend/helpers/excerpt'); diff --git a/ghost/core/test/unit/frontend/helpers/facebook-url.test.js b/ghost/core/test/unit/frontend/helpers/facebook-url.test.js index 967cee5f885..951ce2dc2e5 100644 --- a/ghost/core/test/unit/frontend/helpers/facebook-url.test.js +++ b/ghost/core/test/unit/frontend/helpers/facebook-url.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); // Stuff we are testing const facebook_url = require('../../../../core/frontend/helpers/facebook_url'); diff --git a/ghost/core/test/unit/frontend/helpers/foreach.test.js b/ghost/core/test/unit/frontend/helpers/foreach.test.js index 0c198ee8976..51881fd94c5 100644 --- a/ghost/core/test/unit/frontend/helpers/foreach.test.js +++ b/ghost/core/test/unit/frontend/helpers/foreach.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const _ = require('lodash'); const foreach = require('../../../../core/frontend/helpers/foreach'); diff --git a/ghost/core/test/unit/frontend/helpers/get.test.js b/ghost/core/test/unit/frontend/helpers/get.test.js index 4cd432e2b63..3f96323c882 100644 --- a/ghost/core/test/unit/frontend/helpers/get.test.js +++ b/ghost/core/test/unit/frontend/helpers/get.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const {SafeString} = require('../../../../core/frontend/services/handlebars'); const configUtils = require('../../../utils/config-utils'); diff --git a/ghost/core/test/unit/frontend/helpers/ghost-foot.test.js b/ghost/core/test/unit/frontend/helpers/ghost-foot.test.js index bbef8f750f3..fdf11b589af 100644 --- a/ghost/core/test/unit/frontend/helpers/ghost-foot.test.js +++ b/ghost/core/test/unit/frontend/helpers/ghost-foot.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const ghost_foot = require('../../../../core/frontend/helpers/ghost_foot'); const {settingsCache} = require('../../../../core/frontend/services/proxy'); diff --git a/ghost/core/test/unit/frontend/helpers/ghost-head.test.js b/ghost/core/test/unit/frontend/helpers/ghost-head.test.js index 5b1255d1767..6476247af16 100644 --- a/ghost/core/test/unit/frontend/helpers/ghost-head.test.js +++ b/ghost/core/test/unit/frontend/helpers/ghost-head.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const {assertMatchSnapshot} = require('../../../utils/assertions'); diff --git a/ghost/core/test/unit/frontend/helpers/has.test.js b/ghost/core/test/unit/frontend/helpers/has.test.js index 70f91212056..751f8f2a11d 100644 --- a/ghost/core/test/unit/frontend/helpers/has.test.js +++ b/ghost/core/test/unit/frontend/helpers/has.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); // Stuff we are testing diff --git a/ghost/core/test/unit/frontend/helpers/img-url.test.js b/ghost/core/test/unit/frontend/helpers/img-url.test.js index 118d0f216e7..147fbfc8039 100644 --- a/ghost/core/test/unit/frontend/helpers/img-url.test.js +++ b/ghost/core/test/unit/frontend/helpers/img-url.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const configUtils = require('../../../utils/config-utils'); diff --git a/ghost/core/test/unit/frontend/helpers/link-class.test.js b/ghost/core/test/unit/frontend/helpers/link-class.test.js index f76d2d89b23..e1747f66892 100644 --- a/ghost/core/test/unit/frontend/helpers/link-class.test.js +++ b/ghost/core/test/unit/frontend/helpers/link-class.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const concat = require('../../../../core/frontend/helpers/concat'); const link_class = require('../../../../core/frontend/helpers/link_class'); const handlebars = require('../../../../core/frontend/services/theme-engine/engine').handlebars; diff --git a/ghost/core/test/unit/frontend/helpers/link.test.js b/ghost/core/test/unit/frontend/helpers/link.test.js index 24961abfac2..5b3b3b9e447 100644 --- a/ghost/core/test/unit/frontend/helpers/link.test.js +++ b/ghost/core/test/unit/frontend/helpers/link.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const concat = require('../../../../core/frontend/helpers/concat'); const link = require('../../../../core/frontend/helpers/link'); const url = require('../../../../core/frontend/helpers/url'); diff --git a/ghost/core/test/unit/frontend/helpers/match.test.js b/ghost/core/test/unit/frontend/helpers/match.test.js index 5fb701052b5..057dd582397 100644 --- a/ghost/core/test/unit/frontend/helpers/match.test.js +++ b/ghost/core/test/unit/frontend/helpers/match.test.js @@ -1,4 +1,3 @@ -const should = require('should'); const sinon = require('sinon'); const _ = require('lodash'); diff --git a/ghost/core/test/unit/frontend/helpers/meta-description.test.js b/ghost/core/test/unit/frontend/helpers/meta-description.test.js index 083d159c474..20337b6f7b6 100644 --- a/ghost/core/test/unit/frontend/helpers/meta-description.test.js +++ b/ghost/core/test/unit/frontend/helpers/meta-description.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const meta_description = require('../../../../core/frontend/helpers/meta_description'); const settingsCache = require('../../../../core/shared/settings-cache'); diff --git a/ghost/core/test/unit/frontend/helpers/meta-title.test.js b/ghost/core/test/unit/frontend/helpers/meta-title.test.js index 0723b600aa2..91bb0989b16 100644 --- a/ghost/core/test/unit/frontend/helpers/meta-title.test.js +++ b/ghost/core/test/unit/frontend/helpers/meta-title.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const configUtils = require('../../../utils/config-utils'); const meta_title = require('../../../../core/frontend/helpers/meta_title'); diff --git a/ghost/core/test/unit/frontend/helpers/navigation.test.js b/ghost/core/test/unit/frontend/helpers/navigation.test.js index bf19de4f6e5..b224e6ae11e 100644 --- a/ghost/core/test/unit/frontend/helpers/navigation.test.js +++ b/ghost/core/test/unit/frontend/helpers/navigation.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const hbs = require('../../../../core/frontend/services/theme-engine/engine'); const configUtils = require('../../../utils/config-utils'); const path = require('path'); diff --git a/ghost/core/test/unit/frontend/helpers/page-url.test.js b/ghost/core/test/unit/frontend/helpers/page-url.test.js index ee3fc7c1705..1973fb772ca 100644 --- a/ghost/core/test/unit/frontend/helpers/page-url.test.js +++ b/ghost/core/test/unit/frontend/helpers/page-url.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); // Stuff we are testing const page_url = require('../../../../core/frontend/helpers/page_url'); diff --git a/ghost/core/test/unit/frontend/helpers/plural.test.js b/ghost/core/test/unit/frontend/helpers/plural.test.js index bae7aaae027..a371d42080a 100644 --- a/ghost/core/test/unit/frontend/helpers/plural.test.js +++ b/ghost/core/test/unit/frontend/helpers/plural.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); // Stuff we are testing const plural = require('../../../../core/frontend/helpers/plural'); diff --git a/ghost/core/test/unit/frontend/helpers/post-class.test.js b/ghost/core/test/unit/frontend/helpers/post-class.test.js index 0f0282c98a6..7879b33c6ca 100644 --- a/ghost/core/test/unit/frontend/helpers/post-class.test.js +++ b/ghost/core/test/unit/frontend/helpers/post-class.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); // Stuff we are testing const post_class = require('../../../../core/frontend/helpers/post_class'); diff --git a/ghost/core/test/unit/frontend/helpers/raw.test.js b/ghost/core/test/unit/frontend/helpers/raw.test.js index 0fb0b071c45..51255f461a6 100644 --- a/ghost/core/test/unit/frontend/helpers/raw.test.js +++ b/ghost/core/test/unit/frontend/helpers/raw.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const raw = require('../../../../core/frontend/helpers/raw'); const handlebars = require('../../../../core/frontend/services/theme-engine/engine').handlebars; diff --git a/ghost/core/test/unit/frontend/helpers/reading-time.test.js b/ghost/core/test/unit/frontend/helpers/reading-time.test.js index 137a2c4b968..72eaa465071 100644 --- a/ghost/core/test/unit/frontend/helpers/reading-time.test.js +++ b/ghost/core/test/unit/frontend/helpers/reading-time.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); // Stuff we are testing const reading_time = require('../../../../core/frontend/helpers/reading_time'); diff --git a/ghost/core/test/unit/frontend/helpers/search.test.js b/ghost/core/test/unit/frontend/helpers/search.test.js index 283f89aa2e5..7846e9a5620 100644 --- a/ghost/core/test/unit/frontend/helpers/search.test.js +++ b/ghost/core/test/unit/frontend/helpers/search.test.js @@ -1,4 +1,3 @@ -const should = require('should'); const sinon = require('sinon'); const {registerHelper, shouldCompileToExpected} = require('./utils/handlebars'); diff --git a/ghost/core/test/unit/frontend/helpers/social-url.test.js b/ghost/core/test/unit/frontend/helpers/social-url.test.js index a65182638b8..b96d52cd0ca 100644 --- a/ghost/core/test/unit/frontend/helpers/social-url.test.js +++ b/ghost/core/test/unit/frontend/helpers/social-url.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const handlebars = require('../../../../core/frontend/services/theme-engine/engine').handlebars; const helpers = require('../../../../core/frontend/services/helpers'); const social_url = require('../../../../core/frontend/helpers/social_url'); diff --git a/ghost/core/test/unit/frontend/helpers/t-new.test.js b/ghost/core/test/unit/frontend/helpers/t-new.test.js index b39a9ba7173..82b34adaefe 100644 --- a/ghost/core/test/unit/frontend/helpers/t-new.test.js +++ b/ghost/core/test/unit/frontend/helpers/t-new.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const path = require('path'); const sinon = require('sinon'); const t = require('../../../../core/frontend/helpers/t'); diff --git a/ghost/core/test/unit/frontend/helpers/t.test.js b/ghost/core/test/unit/frontend/helpers/t.test.js index 438268a5c16..8346f221096 100644 --- a/ghost/core/test/unit/frontend/helpers/t.test.js +++ b/ghost/core/test/unit/frontend/helpers/t.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const path = require('path'); const t = require('../../../../core/frontend/helpers/t'); const themeI18n = require('../../../../core/frontend/services/theme-engine/i18n'); diff --git a/ghost/core/test/unit/frontend/helpers/tags.test.js b/ghost/core/test/unit/frontend/helpers/tags.test.js index 3d69c8223ec..992b30bf51e 100644 --- a/ghost/core/test/unit/frontend/helpers/tags.test.js +++ b/ghost/core/test/unit/frontend/helpers/tags.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../utils'); const urlService = require('../../../../core/server/services/url'); diff --git a/ghost/core/test/unit/frontend/helpers/tiers.test.js b/ghost/core/test/unit/frontend/helpers/tiers.test.js index 2a3a46a9119..27e33a9f9e2 100644 --- a/ghost/core/test/unit/frontend/helpers/tiers.test.js +++ b/ghost/core/test/unit/frontend/helpers/tiers.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const tiersHelper = require('../../../../core/frontend/helpers/tiers'); describe('{{tiers}} helper', function () { diff --git a/ghost/core/test/unit/frontend/helpers/title.test.js b/ghost/core/test/unit/frontend/helpers/title.test.js index b9fe50b37b7..da45f48ad96 100644 --- a/ghost/core/test/unit/frontend/helpers/title.test.js +++ b/ghost/core/test/unit/frontend/helpers/title.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); // Stuff we are testing const title = require('../../../../core/frontend/helpers/title'); diff --git a/ghost/core/test/unit/frontend/helpers/total-paid-members.test.js b/ghost/core/test/unit/frontend/helpers/total-paid-members.test.js index 4d195ddf9eb..bfb81f471d8 100644 --- a/ghost/core/test/unit/frontend/helpers/total-paid-members.test.js +++ b/ghost/core/test/unit/frontend/helpers/total-paid-members.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const total_paid_members = require('../../../../core/frontend/helpers/total_paid_members'); diff --git a/ghost/core/test/unit/frontend/helpers/twitter-url.test.js b/ghost/core/test/unit/frontend/helpers/twitter-url.test.js index 526247e8195..a12d9d6a5cd 100644 --- a/ghost/core/test/unit/frontend/helpers/twitter-url.test.js +++ b/ghost/core/test/unit/frontend/helpers/twitter-url.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); // Stuff we are testing const twitter_url = require('../../../../core/frontend/helpers/twitter_url'); diff --git a/ghost/core/test/unit/frontend/helpers/url.test.js b/ghost/core/test/unit/frontend/helpers/url.test.js index 7fd5ada7ffa..5344c5c66a4 100644 --- a/ghost/core/test/unit/frontend/helpers/url.test.js +++ b/ghost/core/test/unit/frontend/helpers/url.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../utils'); diff --git a/ghost/core/test/unit/frontend/meta/author-fb-url.test.js b/ghost/core/test/unit/frontend/meta/author-fb-url.test.js index 8aea329feae..625fa855584 100644 --- a/ghost/core/test/unit/frontend/meta/author-fb-url.test.js +++ b/ghost/core/test/unit/frontend/meta/author-fb-url.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const getAuthorFacebookUrl = require('../../../../core/frontend/meta/author-fb-url'); describe('getAuthorFacebookUrl', function () { diff --git a/ghost/core/test/unit/frontend/meta/author-image.test.js b/ghost/core/test/unit/frontend/meta/author-image.test.js index 85e5856ec8d..138f02badb7 100644 --- a/ghost/core/test/unit/frontend/meta/author-image.test.js +++ b/ghost/core/test/unit/frontend/meta/author-image.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const getAuthorImage = require('../../../../core/frontend/meta/author-image'); diff --git a/ghost/core/test/unit/frontend/meta/author-url.test.js b/ghost/core/test/unit/frontend/meta/author-url.test.js index 0584f9c1e11..af970291dfe 100644 --- a/ghost/core/test/unit/frontend/meta/author-url.test.js +++ b/ghost/core/test/unit/frontend/meta/author-url.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const ObjectId = require('bson-objectid').default; const urlService = require('../../../../core/server/services/url'); diff --git a/ghost/core/test/unit/frontend/meta/blog-logo.test.js b/ghost/core/test/unit/frontend/meta/blog-logo.test.js index 8221ba56a19..61e76eabbdc 100644 --- a/ghost/core/test/unit/frontend/meta/blog-logo.test.js +++ b/ghost/core/test/unit/frontend/meta/blog-logo.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const getBlogLogo = require('../../../../core/frontend/meta/blog-logo'); const sinon = require('sinon'); const settingsCache = require('../../../../core/shared/settings-cache'); diff --git a/ghost/core/test/unit/frontend/meta/context-object.test.js b/ghost/core/test/unit/frontend/meta/context-object.test.js index b12517c7e3c..89089adff57 100644 --- a/ghost/core/test/unit/frontend/meta/context-object.test.js +++ b/ghost/core/test/unit/frontend/meta/context-object.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const getContextObject = require('../../../../core/frontend/meta/context-object.js'); const settingsCache = require('../../../../core/shared/settings-cache'); diff --git a/ghost/core/test/unit/frontend/meta/cover-image.test.js b/ghost/core/test/unit/frontend/meta/cover-image.test.js index 2b26a7db81a..77c8b58c12a 100644 --- a/ghost/core/test/unit/frontend/meta/cover-image.test.js +++ b/ghost/core/test/unit/frontend/meta/cover-image.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const getCoverImage = require('../../../../core/frontend/meta/cover-image'); describe('getCoverImage', function () { diff --git a/ghost/core/test/unit/frontend/meta/creator-url.test.js b/ghost/core/test/unit/frontend/meta/creator-url.test.js index 867654700d8..a739058fdb2 100644 --- a/ghost/core/test/unit/frontend/meta/creator-url.test.js +++ b/ghost/core/test/unit/frontend/meta/creator-url.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const getCreatorTwitterUrl = require('../../../../core/frontend/meta/creator-url'); describe('getCreatorTwitterUrl', function () { diff --git a/ghost/core/test/unit/frontend/meta/description.test.js b/ghost/core/test/unit/frontend/meta/description.test.js index 784756eec52..f78838ab89d 100644 --- a/ghost/core/test/unit/frontend/meta/description.test.js +++ b/ghost/core/test/unit/frontend/meta/description.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const getMetaDescription = require('../../../../core/frontend/meta/description'); const settingsCache = require('../../../../core/shared/settings-cache'); diff --git a/ghost/core/test/unit/frontend/meta/image-dimensions.test.js b/ghost/core/test/unit/frontend/meta/image-dimensions.test.js index 658383a5d72..d8f1edcfbbc 100644 --- a/ghost/core/test/unit/frontend/meta/image-dimensions.test.js +++ b/ghost/core/test/unit/frontend/meta/image-dimensions.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); const _ = require('lodash'); -const should = require('should'); const sinon = require('sinon'); const rewire = require('rewire'); const getImageDimensions = rewire('../../../../core/frontend/meta/image-dimensions'); diff --git a/ghost/core/test/unit/frontend/meta/keywords.test.js b/ghost/core/test/unit/frontend/meta/keywords.test.js index f0be172ee54..6562c021660 100644 --- a/ghost/core/test/unit/frontend/meta/keywords.test.js +++ b/ghost/core/test/unit/frontend/meta/keywords.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const models = require('../../../../core/server/models'); const getKeywords = require('../../../../core/frontend/meta/keywords'); diff --git a/ghost/core/test/unit/frontend/meta/modified-date.test.js b/ghost/core/test/unit/frontend/meta/modified-date.test.js index 4c94df947c6..e225025b7c5 100644 --- a/ghost/core/test/unit/frontend/meta/modified-date.test.js +++ b/ghost/core/test/unit/frontend/meta/modified-date.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const getModifiedDate = require('../../../../core/frontend/meta/modified-date'); describe('getModifiedDate', function () { diff --git a/ghost/core/test/unit/frontend/meta/og-image.test.js b/ghost/core/test/unit/frontend/meta/og-image.test.js index b857dddd07e..c012e2a99e8 100644 --- a/ghost/core/test/unit/frontend/meta/og-image.test.js +++ b/ghost/core/test/unit/frontend/meta/og-image.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const getOgImage = require('../../../../core/frontend/meta/og-image'); const settingsCache = require('../../../../core/shared/settings-cache'); diff --git a/ghost/core/test/unit/frontend/meta/og-type.test.js b/ghost/core/test/unit/frontend/meta/og-type.test.js index 510826d584d..086d84ea8ac 100644 --- a/ghost/core/test/unit/frontend/meta/og-type.test.js +++ b/ghost/core/test/unit/frontend/meta/og-type.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const getOgType = require('../../../../core/frontend/meta/og-type'); describe('getOgType', function () { diff --git a/ghost/core/test/unit/frontend/meta/paginated-url.test.js b/ghost/core/test/unit/frontend/meta/paginated-url.test.js index 4f499bf23e0..65cc9f1644f 100644 --- a/ghost/core/test/unit/frontend/meta/paginated-url.test.js +++ b/ghost/core/test/unit/frontend/meta/paginated-url.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const getPaginatedUrl = require('../../../../core/frontend/meta/paginated-url'); const configUtils = require('../../../utils/config-utils'); diff --git a/ghost/core/test/unit/frontend/meta/published-date.test.js b/ghost/core/test/unit/frontend/meta/published-date.test.js index bfa816499be..9d4024b1fa3 100644 --- a/ghost/core/test/unit/frontend/meta/published-date.test.js +++ b/ghost/core/test/unit/frontend/meta/published-date.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const getPublishedDate = require('../../../../core/frontend/meta/published-date'); describe('getPublishedDate', function () { diff --git a/ghost/core/test/unit/frontend/meta/rss-url.test.js b/ghost/core/test/unit/frontend/meta/rss-url.test.js index d12c3e5a427..87b3234dc24 100644 --- a/ghost/core/test/unit/frontend/meta/rss-url.test.js +++ b/ghost/core/test/unit/frontend/meta/rss-url.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const routing = require('../../../../core/frontend/services/routing'); const getRssUrl = require('../../../../core/frontend/meta/rss-url'); diff --git a/ghost/core/test/unit/frontend/meta/schema.test.js b/ghost/core/test/unit/frontend/meta/schema.test.js index 7d5bcfcf303..589394cb653 100644 --- a/ghost/core/test/unit/frontend/meta/schema.test.js +++ b/ghost/core/test/unit/frontend/meta/schema.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const {getSchema, SOCIAL_PLATFORMS} = require('../../../../core/frontend/meta/schema'); const socialUrls = require('@tryghost/social-urls'); diff --git a/ghost/core/test/unit/frontend/meta/title.test.js b/ghost/core/test/unit/frontend/meta/title.test.js index 579ab07e27c..a844df51a76 100644 --- a/ghost/core/test/unit/frontend/meta/title.test.js +++ b/ghost/core/test/unit/frontend/meta/title.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const getTitle = require('../../../../core/frontend/meta/title'); const settingsCache = require('../../../../core/shared/settings-cache'); diff --git a/ghost/core/test/unit/frontend/meta/twitter-image.test.js b/ghost/core/test/unit/frontend/meta/twitter-image.test.js index 44ee7ba1725..12816278bd6 100644 --- a/ghost/core/test/unit/frontend/meta/twitter-image.test.js +++ b/ghost/core/test/unit/frontend/meta/twitter-image.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const getTwitterImage = require('../../../../core/frontend/meta/twitter-image'); const settingsCache = require('../../../../core/shared/settings-cache'); diff --git a/ghost/core/test/unit/frontend/services/apps/proxy.test.js b/ghost/core/test/unit/frontend/services/apps/proxy.test.js index 80b8e4e7714..23696a3eaf0 100644 --- a/ghost/core/test/unit/frontend/services/apps/proxy.test.js +++ b/ghost/core/test/unit/frontend/services/apps/proxy.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const helpers = require('../../../../../core/frontend/services/helpers'); const AppProxy = require('../../../../../core/frontend/services/apps/proxy'); diff --git a/ghost/core/test/unit/frontend/services/assets-minification/minifier.test.js b/ghost/core/test/unit/frontend/services/assets-minification/minifier.test.js index 0e6b0c156d8..b58ee85326f 100644 --- a/ghost/core/test/unit/frontend/services/assets-minification/minifier.test.js +++ b/ghost/core/test/unit/frontend/services/assets-minification/minifier.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const path = require('path'); const fs = require('fs').promises; diff --git a/ghost/core/test/unit/frontend/services/card-assets.test.js b/ghost/core/test/unit/frontend/services/card-assets.test.js index ca0a1bb9765..55463107af4 100644 --- a/ghost/core/test/unit/frontend/services/card-assets.test.js +++ b/ghost/core/test/unit/frontend/services/card-assets.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const path = require('path'); const fs = require('fs').promises; diff --git a/ghost/core/test/unit/frontend/services/data/checks.test.js b/ghost/core/test/unit/frontend/services/data/checks.test.js index 914c7cad244..59fbebdbd4e 100644 --- a/ghost/core/test/unit/frontend/services/data/checks.test.js +++ b/ghost/core/test/unit/frontend/services/data/checks.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const {checks} = require('../../../../../core/frontend/services/data'); describe('Checks', function () { diff --git a/ghost/core/test/unit/frontend/services/data/entry-lookup.test.js b/ghost/core/test/unit/frontend/services/data/entry-lookup.test.js index 9d8efbac75f..3b1fe4f0ba6 100644 --- a/ghost/core/test/unit/frontend/services/data/entry-lookup.test.js +++ b/ghost/core/test/unit/frontend/services/data/entry-lookup.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const api = require('../../../../../core/frontend/services/proxy').api; diff --git a/ghost/core/test/unit/frontend/services/rendering/context.test.js b/ghost/core/test/unit/frontend/services/rendering/context.test.js index 8b2e880610c..089a75145ec 100644 --- a/ghost/core/test/unit/frontend/services/rendering/context.test.js +++ b/ghost/core/test/unit/frontend/services/rendering/context.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../utils'); const renderer = require('../../../../../core/frontend/services/rendering'); diff --git a/ghost/core/test/unit/frontend/services/rendering/format-response.test.js b/ghost/core/test/unit/frontend/services/rendering/format-response.test.js index 544232b1311..9a96e31da59 100644 --- a/ghost/core/test/unit/frontend/services/rendering/format-response.test.js +++ b/ghost/core/test/unit/frontend/services/rendering/format-response.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const testUtils = require('../../../../utils'); const helpers = require('../../../../../core/frontend/services/rendering'); const {SafeString} = require('../../../../../core/frontend/services/handlebars'); diff --git a/ghost/core/test/unit/frontend/services/rendering/templates.test.js b/ghost/core/test/unit/frontend/services/rendering/templates.test.js index af563a88ede..8afa9b4ddaf 100644 --- a/ghost/core/test/unit/frontend/services/rendering/templates.test.js +++ b/ghost/core/test/unit/frontend/services/rendering/templates.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const rewire = require('rewire'); const templates = rewire('../../../../../core/frontend/services/rendering/templates'); diff --git a/ghost/core/test/unit/frontend/services/routing/bootstrap.test.js b/ghost/core/test/unit/frontend/services/routing/bootstrap.test.js index 871d64d025c..69333a5438b 100644 --- a/ghost/core/test/unit/frontend/services/routing/bootstrap.test.js +++ b/ghost/core/test/unit/frontend/services/routing/bootstrap.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const CollectionRouter = require('../../../../../core/frontend/services/routing/collection-router'); const RouterManager = require('../../../../../core/frontend/services/routing/router-manager'); diff --git a/ghost/core/test/unit/frontend/services/routing/collection-router.test.js b/ghost/core/test/unit/frontend/services/routing/collection-router.test.js index f8eedfcfe9c..52145150327 100644 --- a/ghost/core/test/unit/frontend/services/routing/collection-router.test.js +++ b/ghost/core/test/unit/frontend/services/routing/collection-router.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const express = require('../../../../../core/shared/express')._express; const events = require('../../../../../core/server/lib/common/events'); diff --git a/ghost/core/test/unit/frontend/services/routing/controllers/channel.test.js b/ghost/core/test/unit/frontend/services/routing/controllers/channel.test.js index 569358230bb..8bcca9050e2 100644 --- a/ghost/core/test/unit/frontend/services/routing/controllers/channel.test.js +++ b/ghost/core/test/unit/frontend/services/routing/controllers/channel.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../../utils/assertions'); const errors = require('@tryghost/errors'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../utils'); const security = require('@tryghost/security'); diff --git a/ghost/core/test/unit/frontend/services/routing/controllers/collection.test.js b/ghost/core/test/unit/frontend/services/routing/controllers/collection.test.js index d1a49585840..cd64e21256d 100644 --- a/ghost/core/test/unit/frontend/services/routing/controllers/collection.test.js +++ b/ghost/core/test/unit/frontend/services/routing/controllers/collection.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../../utils/assertions'); const errors = require('@tryghost/errors'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../utils'); const security = require('@tryghost/security'); diff --git a/ghost/core/test/unit/frontend/services/routing/controllers/entry.test.js b/ghost/core/test/unit/frontend/services/routing/controllers/entry.test.js index 7ab2d1fa91d..49c91b37e2a 100644 --- a/ghost/core/test/unit/frontend/services/routing/controllers/entry.test.js +++ b/ghost/core/test/unit/frontend/services/routing/controllers/entry.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../utils'); const configUtils = require('../../../../../utils/config-utils'); diff --git a/ghost/core/test/unit/frontend/services/routing/controllers/previews.test.js b/ghost/core/test/unit/frontend/services/routing/controllers/previews.test.js index 5b569e93b91..f4566662700 100644 --- a/ghost/core/test/unit/frontend/services/routing/controllers/previews.test.js +++ b/ghost/core/test/unit/frontend/services/routing/controllers/previews.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../utils'); const configUtils = require('../../../../../utils/config-utils'); diff --git a/ghost/core/test/unit/frontend/services/routing/controllers/static.test.js b/ghost/core/test/unit/frontend/services/routing/controllers/static.test.js index 4a4f7a3ad32..9e39a18b646 100644 --- a/ghost/core/test/unit/frontend/services/routing/controllers/static.test.js +++ b/ghost/core/test/unit/frontend/services/routing/controllers/static.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const api = require('../../../../../../core/frontend/services/proxy').api; diff --git a/ghost/core/test/unit/frontend/services/routing/middlewares/page-param.test.js b/ghost/core/test/unit/frontend/services/routing/middlewares/page-param.test.js index b2e90b59091..fcae582ca6d 100644 --- a/ghost/core/test/unit/frontend/services/routing/middlewares/page-param.test.js +++ b/ghost/core/test/unit/frontend/services/routing/middlewares/page-param.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const errors = require('@tryghost/errors'); const urlUtils = require('../../../../../../core/shared/url-utils'); diff --git a/ghost/core/test/unit/frontend/services/routing/parent-router.test.js b/ghost/core/test/unit/frontend/services/routing/parent-router.test.js index 77a2ef623e2..ce82f09773c 100644 --- a/ghost/core/test/unit/frontend/services/routing/parent-router.test.js +++ b/ghost/core/test/unit/frontend/services/routing/parent-router.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const configUtils = require('../../../../utils/config-utils'); const urlUtils = require('../../../../../core/shared/url-utils'); diff --git a/ghost/core/test/unit/frontend/services/routing/registry.test.js b/ghost/core/test/unit/frontend/services/routing/registry.test.js index 92eed3381e3..0b3c49ce205 100644 --- a/ghost/core/test/unit/frontend/services/routing/registry.test.js +++ b/ghost/core/test/unit/frontend/services/routing/registry.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const registry = require('../../../../../core/frontend/services/routing/registry'); diff --git a/ghost/core/test/unit/frontend/services/routing/rss-router.test.js b/ghost/core/test/unit/frontend/services/routing/rss-router.test.js index 5406cf88390..c76c332d42e 100644 --- a/ghost/core/test/unit/frontend/services/routing/rss-router.test.js +++ b/ghost/core/test/unit/frontend/services/routing/rss-router.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const configUtils = require('../../../../utils/config-utils'); const controllers = require('../../../../../core/frontend/services/routing/controllers'); diff --git a/ghost/core/test/unit/frontend/services/routing/static-routes-router.test.js b/ghost/core/test/unit/frontend/services/routing/static-routes-router.test.js index 2c987c1d549..ad7ff2f0873 100644 --- a/ghost/core/test/unit/frontend/services/routing/static-routes-router.test.js +++ b/ghost/core/test/unit/frontend/services/routing/static-routes-router.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const controllers = require('../../../../../core/frontend/services/routing/controllers'); const StaticRoutesRouter = require('../../../../../core/frontend/services/routing/static-routes-router'); diff --git a/ghost/core/test/unit/frontend/services/routing/taxonomy-router.test.js b/ghost/core/test/unit/frontend/services/routing/taxonomy-router.test.js index b8a1901103f..edee1369cb4 100644 --- a/ghost/core/test/unit/frontend/services/routing/taxonomy-router.test.js +++ b/ghost/core/test/unit/frontend/services/routing/taxonomy-router.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const settingsCache = require('../../../../../core/shared/settings-cache'); const controllers = require('../../../../../core/frontend/services/routing/controllers'); diff --git a/ghost/core/test/unit/frontend/services/rss/cache.test.js b/ghost/core/test/unit/frontend/services/rss/cache.test.js index 1688d649acd..bd8cdd87f7f 100644 --- a/ghost/core/test/unit/frontend/services/rss/cache.test.js +++ b/ghost/core/test/unit/frontend/services/rss/cache.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const rewire = require('rewire'); const configUtils = require('../../../../utils/config-utils'); diff --git a/ghost/core/test/unit/frontend/services/rss/generate-feed.test.js b/ghost/core/test/unit/frontend/services/rss/generate-feed.test.js index aaeb5b0a1d7..007e5843ec9 100644 --- a/ghost/core/test/unit/frontend/services/rss/generate-feed.test.js +++ b/ghost/core/test/unit/frontend/services/rss/generate-feed.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const _ = require('lodash'); const testUtils = require('../../../../utils'); diff --git a/ghost/core/test/unit/frontend/services/rss/renderer.test.js b/ghost/core/test/unit/frontend/services/rss/renderer.test.js index a4c1d15e02a..2ea3c20fc9e 100644 --- a/ghost/core/test/unit/frontend/services/rss/renderer.test.js +++ b/ghost/core/test/unit/frontend/services/rss/renderer.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const rssCache = require('../../../../../core/frontend/services/rss/cache'); const renderer = require('../../../../../core/frontend/services/rss/renderer'); diff --git a/ghost/core/test/unit/frontend/services/sitemap/manager.test.js b/ghost/core/test/unit/frontend/services/sitemap/manager.test.js index 01ddf09084b..566cb63635b 100644 --- a/ghost/core/test/unit/frontend/services/sitemap/manager.test.js +++ b/ghost/core/test/unit/frontend/services/sitemap/manager.test.js @@ -1,4 +1,3 @@ -const should = require('should'); const sinon = require('sinon'); const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); diff --git a/ghost/core/test/unit/frontend/services/theme-engine/active.test.js b/ghost/core/test/unit/frontend/services/theme-engine/active.test.js index 46867f1cbba..eadce3c043a 100644 --- a/ghost/core/test/unit/frontend/services/theme-engine/active.test.js +++ b/ghost/core/test/unit/frontend/services/theme-engine/active.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const config = require('../../../../../core/shared/config'); diff --git a/ghost/core/test/unit/frontend/services/theme-engine/config.test.js b/ghost/core/test/unit/frontend/services/theme-engine/config.test.js index d56d4897fa1..c132af7807b 100644 --- a/ghost/core/test/unit/frontend/services/theme-engine/config.test.js +++ b/ghost/core/test/unit/frontend/services/theme-engine/config.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const themeConfig = require('../../../../../core/frontend/services/theme-engine/config'); diff --git a/ghost/core/test/unit/frontend/services/theme-engine/i18n.test.js b/ghost/core/test/unit/frontend/services/theme-engine/i18n.test.js index 6369c8fa9cb..3c99dc863c8 100644 --- a/ghost/core/test/unit/frontend/services/theme-engine/i18n.test.js +++ b/ghost/core/test/unit/frontend/services/theme-engine/i18n.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const I18n = require('../../../../../core/frontend/services/theme-engine/i18n/i18n'); diff --git a/ghost/core/test/unit/frontend/services/theme-engine/middleware.test.js b/ghost/core/test/unit/frontend/services/theme-engine/middleware.test.js index cb8cf766390..6571be7f0bf 100644 --- a/ghost/core/test/unit/frontend/services/theme-engine/middleware.test.js +++ b/ghost/core/test/unit/frontend/services/theme-engine/middleware.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const hbs = require('../../../../../core/frontend/services/theme-engine/engine'); const middleware = require('../../../../../core/frontend/services/theme-engine').middleware; diff --git a/ghost/core/test/unit/frontend/services/theme-engine/theme-i18n.test.js b/ghost/core/test/unit/frontend/services/theme-engine/theme-i18n.test.js index aa6395a36f8..98452d18990 100644 --- a/ghost/core/test/unit/frontend/services/theme-engine/theme-i18n.test.js +++ b/ghost/core/test/unit/frontend/services/theme-engine/theme-i18n.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const ThemeI18n = require('../../../../../core/frontend/services/theme-engine/i18n').ThemeI18n; diff --git a/ghost/core/test/unit/frontend/src/privacy.test.js b/ghost/core/test/unit/frontend/src/privacy.test.js index 09b5b7b44bd..5487cb6f603 100644 --- a/ghost/core/test/unit/frontend/src/privacy.test.js +++ b/ghost/core/test/unit/frontend/src/privacy.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); // Use path relative to test file const { diff --git a/ghost/core/test/unit/frontend/src/url-attribution.test.js b/ghost/core/test/unit/frontend/src/url-attribution.test.js index ccf198b8958..e99bf2ccd45 100644 --- a/ghost/core/test/unit/frontend/src/url-attribution.test.js +++ b/ghost/core/test/unit/frontend/src/url-attribution.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const {JSDOM} = require('jsdom'); diff --git a/ghost/core/test/unit/frontend/utils/frontend-apps.test.js b/ghost/core/test/unit/frontend/utils/frontend-apps.test.js index 6bb33075636..72913a70e57 100644 --- a/ghost/core/test/unit/frontend/utils/frontend-apps.test.js +++ b/ghost/core/test/unit/frontend/utils/frontend-apps.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const {getFrontendAppConfig, getDataAttributes} = require('../../../../core/frontend/utils/frontend-apps'); const configUtils = require('../../../utils/config-utils'); diff --git a/ghost/core/test/unit/frontend/utils/member-count.test.js b/ghost/core/test/unit/frontend/utils/member-count.test.js index db3ab4aa70f..f6000428b3d 100644 --- a/ghost/core/test/unit/frontend/utils/member-count.test.js +++ b/ghost/core/test/unit/frontend/utils/member-count.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const {memberCountRounding, getMemberStats} = require('../../../../core/frontend/utils/member-count'); const getMemberStatsMock = [ diff --git a/ghost/core/test/unit/frontend/web/middleware/error-handler.test.js b/ghost/core/test/unit/frontend/web/middleware/error-handler.test.js index c07795d1fcf..6b3ad358e47 100644 --- a/ghost/core/test/unit/frontend/web/middleware/error-handler.test.js +++ b/ghost/core/test/unit/frontend/web/middleware/error-handler.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const errors = require('@tryghost/errors'); diff --git a/ghost/core/test/unit/frontend/web/middleware/handle-image-sizes.test.js b/ghost/core/test/unit/frontend/web/middleware/handle-image-sizes.test.js index 284732b19bc..9aa38fb879d 100644 --- a/ghost/core/test/unit/frontend/web/middleware/handle-image-sizes.test.js +++ b/ghost/core/test/unit/frontend/web/middleware/handle-image-sizes.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const storage = require('../../../../../core/server/adapters/storage'); const activeTheme = require('../../../../../core/frontend/services/theme-engine/active'); diff --git a/ghost/core/test/unit/frontend/web/middleware/redirect-ghost-to-admin.test.js b/ghost/core/test/unit/frontend/web/middleware/redirect-ghost-to-admin.test.js index bfa88a4cd84..b16ebb4fa8c 100644 --- a/ghost/core/test/unit/frontend/web/middleware/redirect-ghost-to-admin.test.js +++ b/ghost/core/test/unit/frontend/web/middleware/redirect-ghost-to-admin.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const redirectGhostToAdmin = require('../../../../../core/frontend/web/middleware/redirect-ghost-to-admin'); const {handleAdminRedirect} = require('../../../../../core/frontend/web/middleware/redirect-ghost-to-admin'); diff --git a/ghost/core/test/unit/frontend/web/middleware/serve-public-file.test.js b/ghost/core/test/unit/frontend/web/middleware/serve-public-file.test.js index c84e8c88c35..e5acc34383f 100644 --- a/ghost/core/test/unit/frontend/web/middleware/serve-public-file.test.js +++ b/ghost/core/test/unit/frontend/web/middleware/serve-public-file.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const fs = require('fs-extra'); const config = require('../../../../../core/shared/config'); diff --git a/ghost/core/test/unit/server/adapters/scheduling/scheduling-default.test.js b/ghost/core/test/unit/server/adapters/scheduling/scheduling-default.test.js index a7501ebd446..39cd1b4f90c 100644 --- a/ghost/core/test/unit/server/adapters/scheduling/scheduling-default.test.js +++ b/ghost/core/test/unit/server/adapters/scheduling/scheduling-default.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const moment = require('moment'); const _ = require('lodash'); diff --git a/ghost/core/test/unit/server/adapters/scheduling/utils.test.js b/ghost/core/test/unit/server/adapters/scheduling/utils.test.js index 06daa1a6f37..83307801596 100644 --- a/ghost/core/test/unit/server/adapters/scheduling/utils.test.js +++ b/ghost/core/test/unit/server/adapters/scheduling/utils.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const fs = require('fs-extra'); const configUtils = require('../../../../utils/config-utils'); const schedulingUtils = require('../../../../../core/server/adapters/scheduling/utils'); diff --git a/ghost/core/test/unit/server/adapters/storage/index.test.js b/ghost/core/test/unit/server/adapters/storage/index.test.js index 517a227e478..a5ec5e8449f 100644 --- a/ghost/core/test/unit/server/adapters/storage/index.test.js +++ b/ghost/core/test/unit/server/adapters/storage/index.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const fs = require('fs-extra'); const StorageBase = require('ghost-storage-base'); const configUtils = require('../../../../utils/config-utils'); diff --git a/ghost/core/test/unit/server/adapters/storage/local-base-storage.test.js b/ghost/core/test/unit/server/adapters/storage/local-base-storage.test.js index 2cae01e7411..f2417386e99 100644 --- a/ghost/core/test/unit/server/adapters/storage/local-base-storage.test.js +++ b/ghost/core/test/unit/server/adapters/storage/local-base-storage.test.js @@ -2,7 +2,6 @@ const assert = require('node:assert/strict'); const path = require('path'); const http = require('http'); const express = require('express'); -const should = require('should'); const sinon = require('sinon'); const fs = require('fs-extra'); const LocalStorageBase = require('../../../../../core/server/adapters/storage/LocalStorageBase'); diff --git a/ghost/core/test/unit/server/adapters/storage/local-images-storage.test.js b/ghost/core/test/unit/server/adapters/storage/local-images-storage.test.js index 8b550d23e31..80dcb0551b4 100644 --- a/ghost/core/test/unit/server/adapters/storage/local-images-storage.test.js +++ b/ghost/core/test/unit/server/adapters/storage/local-images-storage.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); const errors = require('@tryghost/errors'); -const should = require('should'); const sinon = require('sinon'); const fs = require('fs-extra'); const moment = require('moment'); diff --git a/ghost/core/test/unit/server/data/db/backup.test.js b/ghost/core/test/unit/server/data/db/backup.test.js index 4f5565f0bc7..a5a3a464e7a 100644 --- a/ghost/core/test/unit/server/data/db/backup.test.js +++ b/ghost/core/test/unit/server/data/db/backup.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const fs = require('fs-extra'); const models = require('../../../../../core/server/models'); diff --git a/ghost/core/test/unit/server/data/exporter/index.test.js b/ghost/core/test/unit/server/data/exporter/index.test.js index 51c1f8c1bee..11b7dde9f4d 100644 --- a/ghost/core/test/unit/server/data/exporter/index.test.js +++ b/ghost/core/test/unit/server/data/exporter/index.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const errors = require('@tryghost/errors'); const db = require('../../../../../core/server/data/db'); diff --git a/ghost/core/test/unit/server/data/importer/handlers/image.test.js b/ghost/core/test/unit/server/data/importer/handlers/image.test.js index 33a98ba4e36..79425029229 100644 --- a/ghost/core/test/unit/server/data/importer/handlers/image.test.js +++ b/ghost/core/test/unit/server/data/importer/handlers/image.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -require('should'); const sinon = require('sinon'); const _ = require('lodash'); diff --git a/ghost/core/test/unit/server/data/importer/import-manager.test.js b/ghost/core/test/unit/server/data/importer/import-manager.test.js index f97b5e7f443..56288377601 100644 --- a/ghost/core/test/unit/server/data/importer/import-manager.test.js +++ b/ghost/core/test/unit/server/data/importer/import-manager.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const fs = require('fs-extra'); const path = require('path'); const glob = require('glob'); diff --git a/ghost/core/test/unit/server/data/importer/importers/data/newsletters.test.js b/ghost/core/test/unit/server/data/importer/importers/data/newsletters.test.js index 1cf53c3cf78..090f5fa3ae1 100644 --- a/ghost/core/test/unit/server/data/importer/importers/data/newsletters.test.js +++ b/ghost/core/test/unit/server/data/importer/importers/data/newsletters.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const NewslettersImporter = require('../../../../../../../core/server/data/importer/importers/data/newsletters-importer'); const fakeNewsletters = [{ diff --git a/ghost/core/test/unit/server/data/importer/importers/data/posts.test.js b/ghost/core/test/unit/server/data/importer/importers/data/posts.test.js index 300cf9ded2f..6e6bbb81258 100644 --- a/ghost/core/test/unit/server/data/importer/importers/data/posts.test.js +++ b/ghost/core/test/unit/server/data/importer/importers/data/posts.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../../../utils/assertions'); -const should = require('should'); const find = require('lodash/find'); const PostsImporter = require('../../../../../../../core/server/data/importer/importers/data/posts-importer'); diff --git a/ghost/core/test/unit/server/data/importer/importers/data/settings.test.js b/ghost/core/test/unit/server/data/importer/importers/data/settings.test.js index a5891a0b5fe..6a375bf3488 100644 --- a/ghost/core/test/unit/server/data/importer/importers/data/settings.test.js +++ b/ghost/core/test/unit/server/data/importer/importers/data/settings.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../../../utils/assertions'); const find = require('lodash/find'); -const should = require('should'); const SettingsImporter = require('../../../../../../../core/server/data/importer/importers/data/settings-importer'); describe('SettingsImporter', function () { diff --git a/ghost/core/test/unit/server/data/migrations/utils.test.js b/ghost/core/test/unit/server/data/migrations/utils.test.js index 104d784fbb2..571b81ee698 100644 --- a/ghost/core/test/unit/server/data/migrations/utils.test.js +++ b/ghost/core/test/unit/server/data/migrations/utils.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const errors = require('@tryghost/errors'); const logging = require('@tryghost/logging'); diff --git a/ghost/core/test/unit/server/data/schema/commands.test.js b/ghost/core/test/unit/server/data/schema/commands.test.js index 6035c6dca0d..4fd10f50902 100644 --- a/ghost/core/test/unit/server/data/schema/commands.test.js +++ b/ghost/core/test/unit/server/data/schema/commands.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const errors = require('@tryghost/errors'); const commands = require('../../../../../core/server/data/schema/commands'); diff --git a/ghost/core/test/unit/server/data/schema/fixtures/fixture-manager.test.js b/ghost/core/test/unit/server/data/schema/fixtures/fixture-manager.test.js index 0432806ddea..c06e0c82dea 100644 --- a/ghost/core/test/unit/server/data/schema/fixtures/fixture-manager.test.js +++ b/ghost/core/test/unit/server/data/schema/fixtures/fixture-manager.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const _ = require('lodash'); diff --git a/ghost/core/test/unit/server/data/schema/schema.test.js b/ghost/core/test/unit/server/data/schema/schema.test.js index f61f6f62a47..92a83e48f9d 100644 --- a/ghost/core/test/unit/server/data/schema/schema.test.js +++ b/ghost/core/test/unit/server/data/schema/schema.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const _ = require('lodash'); const schema = require('../../../../../core/server/data/schema/schema'); diff --git a/ghost/core/test/unit/server/lib/image/blog-icon.test.js b/ghost/core/test/unit/server/lib/image/blog-icon.test.js index ec37574d81f..b61aa84a1b5 100644 --- a/ghost/core/test/unit/server/lib/image/blog-icon.test.js +++ b/ghost/core/test/unit/server/lib/image/blog-icon.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const path = require('path'); const BlogIcon = require('../../../../../core/server/lib/image/blog-icon'); diff --git a/ghost/core/test/unit/server/lib/image/cached-image-size-from-url.test.js b/ghost/core/test/unit/server/lib/image/cached-image-size-from-url.test.js index 06ab65bf1ef..50f10bf4439 100644 --- a/ghost/core/test/unit/server/lib/image/cached-image-size-from-url.test.js +++ b/ghost/core/test/unit/server/lib/image/cached-image-size-from-url.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); const errors = require('@tryghost/errors'); -const should = require('should'); const sinon = require('sinon'); const CachedImageSizeFromUrl = require('../../../../../core/server/lib/image/cached-image-size-from-url'); const InMemoryCache = require('../../../../../core/server/adapters/cache/MemoryCache'); diff --git a/ghost/core/test/unit/server/lib/image/gravatar.test.js b/ghost/core/test/unit/server/lib/image/gravatar.test.js index 22c9995f50c..82123e6fa5b 100644 --- a/ghost/core/test/unit/server/lib/image/gravatar.test.js +++ b/ghost/core/test/unit/server/lib/image/gravatar.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const Gravatar = require('../../../../../core/server/lib/image/gravatar'); describe('lib/image: gravatar', function () { diff --git a/ghost/core/test/unit/server/lib/image/image-size.test.js b/ghost/core/test/unit/server/lib/image/image-size.test.js index 0611ed51b68..ff5392211df 100644 --- a/ghost/core/test/unit/server/lib/image/image-size.test.js +++ b/ghost/core/test/unit/server/lib/image/image-size.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const nock = require('nock'); const path = require('path'); diff --git a/ghost/core/test/unit/server/lib/lexical.test.js b/ghost/core/test/unit/server/lib/lexical.test.js index da814c65945..848f3f5a696 100644 --- a/ghost/core/test/unit/server/lib/lexical.test.js +++ b/ghost/core/test/unit/server/lib/lexical.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const jsdom = require('jsdom'); const lexicalLib = require('../../../../core/server/lib/lexical'); diff --git a/ghost/core/test/unit/server/lib/mobiledoc.test.js b/ghost/core/test/unit/server/lib/mobiledoc.test.js index 73609dd8c75..66d17dedd66 100644 --- a/ghost/core/test/unit/server/lib/mobiledoc.test.js +++ b/ghost/core/test/unit/server/lib/mobiledoc.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); const path = require('path'); -const should = require('should'); const sinon = require('sinon'); const nock = require('nock'); const configUtils = require('../../../utils/config-utils'); diff --git a/ghost/core/test/unit/server/lib/package-json/parse.test.js b/ghost/core/test/unit/server/lib/package-json/parse.test.js index fe8a8008bba..b423308f5c4 100644 --- a/ghost/core/test/unit/server/lib/package-json/parse.test.js +++ b/ghost/core/test/unit/server/lib/package-json/parse.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -require('should'); const tmp = require('tmp'); const fs = require('fs-extra'); diff --git a/ghost/core/test/unit/server/lib/package-json/read.test.js b/ghost/core/test/unit/server/lib/package-json/read.test.js index 893ee5834d8..9abdf289d65 100644 --- a/ghost/core/test/unit/server/lib/package-json/read.test.js +++ b/ghost/core/test/unit/server/lib/package-json/read.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -require('should'); const tmp = require('tmp'); const join = require('path').join; diff --git a/ghost/core/test/unit/server/lib/request-external.test.js b/ghost/core/test/unit/server/lib/request-external.test.js index 229af381cd1..bd7af847d16 100644 --- a/ghost/core/test/unit/server/lib/request-external.test.js +++ b/ghost/core/test/unit/server/lib/request-external.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); const sinon = require('sinon'); -const should = require('should'); const nock = require('nock'); const externalRequest = require('../../../../core/server/lib/request-external'); const configUtils = require('../../../utils/config-utils'); diff --git a/ghost/core/test/unit/server/models/api-key.test.js b/ghost/core/test/unit/server/models/api-key.test.js index a707a344f46..7f26904092a 100644 --- a/ghost/core/test/unit/server/models/api-key.test.js +++ b/ghost/core/test/unit/server/models/api-key.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const models = require('../../../../core/server/models'); -const should = require('should'); const sinon = require('sinon'); describe('Unit: models/api_key', function () { diff --git a/ghost/core/test/unit/server/models/base/crud.test.js b/ghost/core/test/unit/server/models/base/crud.test.js index 799ba409be5..d69fc3b7ce0 100644 --- a/ghost/core/test/unit/server/models/base/crud.test.js +++ b/ghost/core/test/unit/server/models/base/crud.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const errors = require('@tryghost/errors'); -const should = require('should'); const sinon = require('sinon'); const models = require('../../../../../core/server/models'); diff --git a/ghost/core/test/unit/server/models/base/index.test.js b/ghost/core/test/unit/server/models/base/index.test.js index 11ef6c30d4c..b4921822194 100644 --- a/ghost/core/test/unit/server/models/base/index.test.js +++ b/ghost/core/test/unit/server/models/base/index.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const security = require('@tryghost/security'); const models = require('../../../../../core/server/models'); diff --git a/ghost/core/test/unit/server/models/base/relations.test.js b/ghost/core/test/unit/server/models/base/relations.test.js index 41abdfbb938..2868eae939b 100644 --- a/ghost/core/test/unit/server/models/base/relations.test.js +++ b/ghost/core/test/unit/server/models/base/relations.test.js @@ -1,4 +1,3 @@ -const should = require('should'); const sinon = require('sinon'); const models = require('../../../../../core/server/models'); const assert = require('node:assert/strict'); diff --git a/ghost/core/test/unit/server/models/comment.test.js b/ghost/core/test/unit/server/models/comment.test.js index ddaa2f70ae6..2b9dc02f14c 100644 --- a/ghost/core/test/unit/server/models/comment.test.js +++ b/ghost/core/test/unit/server/models/comment.test.js @@ -1,4 +1,3 @@ -require('should'); const sinon = require('sinon'); const models = require('../../../../core/server/models'); diff --git a/ghost/core/test/unit/server/models/custom-theme-setting.test.js b/ghost/core/test/unit/server/models/custom-theme-setting.test.js index b603782bc34..9700db83b75 100644 --- a/ghost/core/test/unit/server/models/custom-theme-setting.test.js +++ b/ghost/core/test/unit/server/models/custom-theme-setting.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const models = require('../../../../core/server/models'); const config = require('../../../../core/shared/config'); diff --git a/ghost/core/test/unit/server/models/integration.test.js b/ghost/core/test/unit/server/models/integration.test.js index e7ba50ee08f..eb65e7859da 100644 --- a/ghost/core/test/unit/server/models/integration.test.js +++ b/ghost/core/test/unit/server/models/integration.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const models = require('../../../../core/server/models'); const {knex} = require('../../../../core/server/data/db'); diff --git a/ghost/core/test/unit/server/models/member-created-event.test.js b/ghost/core/test/unit/server/models/member-created-event.test.js index 640f98a8cab..4f5230cace2 100644 --- a/ghost/core/test/unit/server/models/member-created-event.test.js +++ b/ghost/core/test/unit/server/models/member-created-event.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const errors = require('@tryghost/errors'); const models = require('../../../../core/server/models'); diff --git a/ghost/core/test/unit/server/models/member-feedback.test.js b/ghost/core/test/unit/server/models/member-feedback.test.js index 6c0ee31becb..54c726514e3 100644 --- a/ghost/core/test/unit/server/models/member-feedback.test.js +++ b/ghost/core/test/unit/server/models/member-feedback.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const errors = require('@tryghost/errors'); const models = require('../../../../core/server/models'); diff --git a/ghost/core/test/unit/server/models/member-subscribe-event.test.js b/ghost/core/test/unit/server/models/member-subscribe-event.test.js index edb096a680c..a1dcbcdec08 100644 --- a/ghost/core/test/unit/server/models/member-subscribe-event.test.js +++ b/ghost/core/test/unit/server/models/member-subscribe-event.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const errors = require('@tryghost/errors'); const models = require('../../../../core/server/models'); diff --git a/ghost/core/test/unit/server/models/member.test.js b/ghost/core/test/unit/server/models/member.test.js index 6229b97c7dd..f362145df16 100644 --- a/ghost/core/test/unit/server/models/member.test.js +++ b/ghost/core/test/unit/server/models/member.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const sinon = require('sinon'); -const should = require('should'); const models = require('../../../../core/server/models'); const configUtils = require('../../../utils/config-utils'); const labs = require('../../../../core/shared/labs'); diff --git a/ghost/core/test/unit/server/models/newsletter.test.js b/ghost/core/test/unit/server/models/newsletter.test.js index 825a9771299..a33f608875a 100644 --- a/ghost/core/test/unit/server/models/newsletter.test.js +++ b/ghost/core/test/unit/server/models/newsletter.test.js @@ -2,7 +2,6 @@ const assert = require('node:assert/strict'); const errors = require('@tryghost/errors'); const sinon = require('sinon'); -const should = require('should'); const models = require('../../../../core/server/models'); describe('Unit: models/newsletter', function () { diff --git a/ghost/core/test/unit/server/models/permission.test.js b/ghost/core/test/unit/server/models/permission.test.js index 878cf8605c6..64cab0656b7 100644 --- a/ghost/core/test/unit/server/models/permission.test.js +++ b/ghost/core/test/unit/server/models/permission.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const models = require('../../../../core/server/models'); const configUtils = require('../../../utils/config-utils'); diff --git a/ghost/core/test/unit/server/models/post.test.js b/ghost/core/test/unit/server/models/post.test.js index e5151d812d8..872a5cccadb 100644 --- a/ghost/core/test/unit/server/models/post.test.js +++ b/ghost/core/test/unit/server/models/post.test.js @@ -2,7 +2,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); const errors = require('@tryghost/errors'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../utils'); const knex = require('../../../../core/server/data/db').knex; diff --git a/ghost/core/test/unit/server/models/session.test.js b/ghost/core/test/unit/server/models/session.test.js index d5bbbfc0182..ec4aabcd8ef 100644 --- a/ghost/core/test/unit/server/models/session.test.js +++ b/ghost/core/test/unit/server/models/session.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const models = require('../../../../core/server/models'); diff --git a/ghost/core/test/unit/server/models/set-is-roles.test.js b/ghost/core/test/unit/server/models/set-is-roles.test.js index efee1e0a22f..6c5798b543b 100644 --- a/ghost/core/test/unit/server/models/set-is-roles.test.js +++ b/ghost/core/test/unit/server/models/set-is-roles.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const {setIsRoles} = require('../../../../core/server/models/role-utils'); const _ = require('lodash'); diff --git a/ghost/core/test/unit/server/models/settings.test.js b/ghost/core/test/unit/server/models/settings.test.js index 081de3c5e85..aba6a61f8e8 100644 --- a/ghost/core/test/unit/server/models/settings.test.js +++ b/ghost/core/test/unit/server/models/settings.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const mockDb = require('mock-knex'); const models = require('../../../../core/server/models'); diff --git a/ghost/core/test/unit/server/models/single-use-token.test.js b/ghost/core/test/unit/server/models/single-use-token.test.js index 6e30bf73804..8617c615802 100644 --- a/ghost/core/test/unit/server/models/single-use-token.test.js +++ b/ghost/core/test/unit/server/models/single-use-token.test.js @@ -1,5 +1,4 @@ const models = require('../../../../core/server/models'); -const should = require('should'); const sinon = require('sinon'); const assert = require('node:assert/strict'); const {assertExists} = require('../../../utils/assertions'); diff --git a/ghost/core/test/unit/server/models/stripe-customer-subscription.test.js b/ghost/core/test/unit/server/models/stripe-customer-subscription.test.js index 102a475b38f..7ad4b67c07f 100644 --- a/ghost/core/test/unit/server/models/stripe-customer-subscription.test.js +++ b/ghost/core/test/unit/server/models/stripe-customer-subscription.test.js @@ -1,6 +1,5 @@ const {assertExists} = require('../../../utils/assertions'); const sinon = require('sinon'); -const should = require('should'); const models = require('../../../../core/server/models'); describe('Unit: models/stripe-customer-subscription', function () { diff --git a/ghost/core/test/unit/server/models/subscription-created-event.test.js b/ghost/core/test/unit/server/models/subscription-created-event.test.js index 9f29d018960..fc96ea8b659 100644 --- a/ghost/core/test/unit/server/models/subscription-created-event.test.js +++ b/ghost/core/test/unit/server/models/subscription-created-event.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const errors = require('@tryghost/errors'); const models = require('../../../../core/server/models'); diff --git a/ghost/core/test/unit/server/models/tag.test.js b/ghost/core/test/unit/server/models/tag.test.js index df59cdf5c2a..556f9d9fc8b 100644 --- a/ghost/core/test/unit/server/models/tag.test.js +++ b/ghost/core/test/unit/server/models/tag.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const models = require('../../../../core/server/models'); const {knex} = require('../../../../core/server/data/db'); diff --git a/ghost/core/test/unit/server/models/user.test.js b/ghost/core/test/unit/server/models/user.test.js index 57137d86f3e..1d28b4ac9ab 100644 --- a/ghost/core/test/unit/server/models/user.test.js +++ b/ghost/core/test/unit/server/models/user.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const errors = require('@tryghost/errors'); const models = require('../../../../core/server/models'); diff --git a/ghost/core/test/unit/server/notify.test.js b/ghost/core/test/unit/server/notify.test.js index 39d7a62c4a3..a2e0c25f1b6 100644 --- a/ghost/core/test/unit/server/notify.test.js +++ b/ghost/core/test/unit/server/notify.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const configUtils = require('../../utils/config-utils'); diff --git a/ghost/core/test/unit/server/overrides.test.js b/ghost/core/test/unit/server/overrides.test.js index 8f1501f6bd5..6ec1efc0431 100644 --- a/ghost/core/test/unit/server/overrides.test.js +++ b/ghost/core/test/unit/server/overrides.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const luxon = require('luxon'); require('../../../core/server/overrides'); diff --git a/ghost/core/test/unit/server/services/adapter-manager/options-resolver.test.js b/ghost/core/test/unit/server/services/adapter-manager/options-resolver.test.js index a4b2b2f589c..56a72f56b0a 100644 --- a/ghost/core/test/unit/server/services/adapter-manager/options-resolver.test.js +++ b/ghost/core/test/unit/server/services/adapter-manager/options-resolver.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const resolveAdapterOptions = require('../../../../../core/server/services/adapter-manager/options-resolver'); diff --git a/ghost/core/test/unit/server/services/auth/api-key/admin.test.js b/ghost/core/test/unit/server/services/auth/api-key/admin.test.js index 4bda34f8aed..faf5f1b1420 100644 --- a/ghost/core/test/unit/server/services/auth/api-key/admin.test.js +++ b/ghost/core/test/unit/server/services/auth/api-key/admin.test.js @@ -2,7 +2,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../../utils/assertions'); const errors = require('@tryghost/errors'); const jwt = require('jsonwebtoken'); -const should = require('should'); const sinon = require('sinon'); const apiKeyAuth = require('../../../../../../core/server/services/auth/api-key'); const models = require('../../../../../../core/server/models'); diff --git a/ghost/core/test/unit/server/services/auth/api-key/content.test.js b/ghost/core/test/unit/server/services/auth/api-key/content.test.js index b93555dc799..5a5516accac 100644 --- a/ghost/core/test/unit/server/services/auth/api-key/content.test.js +++ b/ghost/core/test/unit/server/services/auth/api-key/content.test.js @@ -3,7 +3,6 @@ const {assertExists} = require('../../../../../utils/assertions'); const errors = require('@tryghost/errors'); const {authenticateContentApiKey} = require('../../../../../../core/server/services/auth/api-key/content'); const models = require('../../../../../../core/server/models'); -const should = require('should'); const sinon = require('sinon'); describe('Content API Key Auth', function () { diff --git a/ghost/core/test/unit/server/services/auth/members/index.test.js b/ghost/core/test/unit/server/services/auth/members/index.test.js index f68319de445..840116d62fb 100644 --- a/ghost/core/test/unit/server/services/auth/members/index.test.js +++ b/ghost/core/test/unit/server/services/auth/members/index.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const jwt = require('jsonwebtoken'); -const should = require('should'); const {UnauthorizedError} = require('@tryghost/errors'); const members = require('../../../../../../core/server/services/auth/members'); diff --git a/ghost/core/test/unit/server/services/auth/session-from-token.test.js b/ghost/core/test/unit/server/services/auth/session-from-token.test.js index 9ec4ea45a1a..ed5c92f918c 100644 --- a/ghost/core/test/unit/server/services/auth/session-from-token.test.js +++ b/ghost/core/test/unit/server/services/auth/session-from-token.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const express = require('express'); const sinon = require('sinon'); -const should = require('should'); const SessionFromToken = require('../../../../../core/server/services/auth/session/session-from-token'); describe('SessionFromToken', function () { diff --git a/ghost/core/test/unit/server/services/auth/session/middleware.test.js b/ghost/core/test/unit/server/services/auth/session/middleware.test.js index 6d6d0d075c4..e22dad698b3 100644 --- a/ghost/core/test/unit/server/services/auth/session/middleware.test.js +++ b/ghost/core/test/unit/server/services/auth/session/middleware.test.js @@ -3,7 +3,6 @@ const sessionMiddleware = require('../../../../../../core/server/services/auth') const SessionMiddlware = require('../../../../../../core/server/services/auth/session/middleware'); const models = require('../../../../../../core/server/models'); const sinon = require('sinon'); -const should = require('should'); const labs = require('../../../../../../core/shared/labs'); describe('Session Service', function () { diff --git a/ghost/core/test/unit/server/services/auth/session/session-service.test.js b/ghost/core/test/unit/server/services/auth/session/session-service.test.js index f1ca32c3773..d50ffe837c6 100644 --- a/ghost/core/test/unit/server/services/auth/session/session-service.test.js +++ b/ghost/core/test/unit/server/services/auth/session/session-service.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const express = require('express'); const SessionService = require('../../../../../../core/server/services/auth/session/session-service'); diff --git a/ghost/core/test/unit/server/services/auth/session/store.test.js b/ghost/core/test/unit/server/services/auth/session/store.test.js index fee84ca9530..a3f2f589ae9 100644 --- a/ghost/core/test/unit/server/services/auth/session/store.test.js +++ b/ghost/core/test/unit/server/services/auth/session/store.test.js @@ -4,7 +4,6 @@ const models = require('../../../../../../core/server/models'); const EventEmitter = require('events'); const {Store} = require('express-session'); const sinon = require('sinon'); -const should = require('should'); describe('Auth Service SessionStore', function () { before(function () { diff --git a/ghost/core/test/unit/server/services/comments/comments-service-emails-renderer.test.js b/ghost/core/test/unit/server/services/comments/comments-service-emails-renderer.test.js index d92d600f6e5..59ad5c9124c 100644 --- a/ghost/core/test/unit/server/services/comments/comments-service-emails-renderer.test.js +++ b/ghost/core/test/unit/server/services/comments/comments-service-emails-renderer.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const i18nLib = require('@tryghost/i18n'); -const should = require('should'); const CommentsServiceEmailRenderer = require('../../../../../core/server/services/comments/comments-service-email-renderer'); describe('Comments Service Email Renderer', function () { diff --git a/ghost/core/test/unit/server/services/comments/comments-service-emails.test.js b/ghost/core/test/unit/server/services/comments/comments-service-emails.test.js index 0a7f5b186c3..6b80accf295 100644 --- a/ghost/core/test/unit/server/services/comments/comments-service-emails.test.js +++ b/ghost/core/test/unit/server/services/comments/comments-service-emails.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const CommentsServiceEmails = require('../../../../../core/server/services/comments/comments-service-emails'); diff --git a/ghost/core/test/unit/server/services/email-analytics/email-analytics-service.test.js b/ghost/core/test/unit/server/services/email-analytics/email-analytics-service.test.js index 501d5f41680..0a8637a967b 100644 --- a/ghost/core/test/unit/server/services/email-analytics/email-analytics-service.test.js +++ b/ghost/core/test/unit/server/services/email-analytics/email-analytics-service.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -require('should'); const sinon = require('sinon'); const configUtils = require('../../../../utils/config-utils'); diff --git a/ghost/core/test/unit/server/services/koenig/node-renderers/header-v2-renderer.test.js b/ghost/core/test/unit/server/services/koenig/node-renderers/header-v2-renderer.test.js index a3e332a0da5..f22597e3ffb 100644 --- a/ghost/core/test/unit/server/services/koenig/node-renderers/header-v2-renderer.test.js +++ b/ghost/core/test/unit/server/services/koenig/node-renderers/header-v2-renderer.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const {callRenderer, html, assertPrettifiesTo, assertPrettifiedIncludes} = require('../test-utils'); describe('services/koenig/node-renderers/header-v2-renderer', function () { diff --git a/ghost/core/test/unit/server/services/lib/dynamic-redirect-manager.test.js b/ghost/core/test/unit/server/services/lib/dynamic-redirect-manager.test.js index 670935ff911..624a2bd037a 100644 --- a/ghost/core/test/unit/server/services/lib/dynamic-redirect-manager.test.js +++ b/ghost/core/test/unit/server/services/lib/dynamic-redirect-manager.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const DynamicRedirectManager = require('../../../../../core/server/services/lib/dynamic-redirect-manager'); const urlJoin = (...parts) => { diff --git a/ghost/core/test/unit/server/services/link-tracking/link-click-repository.test.js b/ghost/core/test/unit/server/services/link-tracking/link-click-repository.test.js index eca6243c90c..6cb098644c6 100644 --- a/ghost/core/test/unit/server/services/link-tracking/link-click-repository.test.js +++ b/ghost/core/test/unit/server/services/link-tracking/link-click-repository.test.js @@ -1,4 +1,3 @@ -const should = require('should'); const sinon = require('sinon'); const ObjectID = require('bson-objectid').default; const configUtils = require('../../../../utils/config-utils'); diff --git a/ghost/core/test/unit/server/services/link-tracking/post-link-repository.test.js b/ghost/core/test/unit/server/services/link-tracking/post-link-repository.test.js index 9faaccd968f..164ff3c9385 100644 --- a/ghost/core/test/unit/server/services/link-tracking/post-link-repository.test.js +++ b/ghost/core/test/unit/server/services/link-tracking/post-link-repository.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const PostLinkRepository = require('../../../../../core/server/services/link-tracking/post-link-repository'); diff --git a/ghost/core/test/unit/server/services/mail/ghost-mailer.test.js b/ghost/core/test/unit/server/services/mail/ghost-mailer.test.js index bb0f3de3ab1..bd2715ffa31 100644 --- a/ghost/core/test/unit/server/services/mail/ghost-mailer.test.js +++ b/ghost/core/test/unit/server/services/mail/ghost-mailer.test.js @@ -1,5 +1,4 @@ const dns = require('dns'); -const should = require('should'); const sinon = require('sinon'); const mail = require('../../../../../core/server/services/mail'); const settingsCache = require('../../../../../core/shared/settings-cache'); diff --git a/ghost/core/test/unit/server/services/member-attribution/attribution.test.js b/ghost/core/test/unit/server/services/member-attribution/attribution.test.js index eec4fe3dd3e..9aa19204a0b 100644 --- a/ghost/core/test/unit/server/services/member-attribution/attribution.test.js +++ b/ghost/core/test/unit/server/services/member-attribution/attribution.test.js @@ -1,4 +1,3 @@ -const should = require('should'); const {assertObjectMatches} = require('../../../../utils/assertions'); const UrlHistory = require('../../../../../core/server/services/member-attribution/url-history'); diff --git a/ghost/core/test/unit/server/services/member-attribution/outbound-link-tagger.test.js b/ghost/core/test/unit/server/services/member-attribution/outbound-link-tagger.test.js index 5f8872a80bf..62ae01e48cb 100644 --- a/ghost/core/test/unit/server/services/member-attribution/outbound-link-tagger.test.js +++ b/ghost/core/test/unit/server/services/member-attribution/outbound-link-tagger.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const OutboundLinkTagger = require('../../../../../core/server/services/member-attribution/outbound-link-tagger'); diff --git a/ghost/core/test/unit/server/services/member-attribution/referrer-translator.test.js b/ghost/core/test/unit/server/services/member-attribution/referrer-translator.test.js index ad2fc8dd34f..ac13d4768b5 100644 --- a/ghost/core/test/unit/server/services/member-attribution/referrer-translator.test.js +++ b/ghost/core/test/unit/server/services/member-attribution/referrer-translator.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const ReferrerTranslator = require('../../../../../core/server/services/member-attribution/referrer-translator'); diff --git a/ghost/core/test/unit/server/services/member-welcome-emails/member-welcome-email-renderer.test.js b/ghost/core/test/unit/server/services/member-welcome-emails/member-welcome-email-renderer.test.js index 69af044962c..9d9e8863fea 100644 --- a/ghost/core/test/unit/server/services/member-welcome-emails/member-welcome-email-renderer.test.js +++ b/ghost/core/test/unit/server/services/member-welcome-emails/member-welcome-email-renderer.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const sinon = require('sinon'); -const should = require('should'); const rewire = require('rewire'); const errors = require('@tryghost/errors'); diff --git a/ghost/core/test/unit/server/services/members-events/last-seen-at-updater.test.js b/ghost/core/test/unit/server/services/members-events/last-seen-at-updater.test.js index 5e3bb0bb834..da20a34f9aa 100644 --- a/ghost/core/test/unit/server/services/members-events/last-seen-at-updater.test.js +++ b/ghost/core/test/unit/server/services/members-events/last-seen-at-updater.test.js @@ -1,4 +1,3 @@ -const should = require('should'); const assert = require('node:assert/strict'); const sinon = require('sinon'); const LastSeenAtUpdater = require('../../../../../core/server/services/members-events/last-seen-at-updater'); diff --git a/ghost/core/test/unit/server/services/members/importer/members-csv-importer-stripe-utils.test.js b/ghost/core/test/unit/server/services/members/importer/members-csv-importer-stripe-utils.test.js index d665b2b9516..f4715005ea0 100644 --- a/ghost/core/test/unit/server/services/members/importer/members-csv-importer-stripe-utils.test.js +++ b/ghost/core/test/unit/server/services/members/importer/members-csv-importer-stripe-utils.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -require('should'); const sinon = require('sinon'); const MembersCSVImporterStripeUtils = require('../../../../../../core/server/services/members/importer/members-csv-importer-stripe-utils'); diff --git a/ghost/core/test/unit/server/services/members/importer/members-csv-importer.test.js b/ghost/core/test/unit/server/services/members/importer/members-csv-importer.test.js index e96ad22053a..97bf4b76aac 100644 --- a/ghost/core/test/unit/server/services/members/importer/members-csv-importer.test.js +++ b/ghost/core/test/unit/server/services/members/importer/members-csv-importer.test.js @@ -1,5 +1,3 @@ -const should = require('should'); - const Tier = require('../../../../../../core/server/services/tiers/tier'); const ObjectID = require('bson-objectid').default; const assert = require('node:assert/strict'); diff --git a/ghost/core/test/unit/server/services/members/members-api/controllers/router-controller.test.js b/ghost/core/test/unit/server/services/members/members-api/controllers/router-controller.test.js index 77136191e9c..e0a81f9ff28 100644 --- a/ghost/core/test/unit/server/services/members/members-api/controllers/router-controller.test.js +++ b/ghost/core/test/unit/server/services/members/members-api/controllers/router-controller.test.js @@ -1,4 +1,3 @@ -require('should'); const sinon = require('sinon'); const assert = require('node:assert/strict'); const errors = require('@tryghost/errors'); diff --git a/ghost/core/test/unit/server/services/members/members-api/repositories/member-repository.test.js b/ghost/core/test/unit/server/services/members/members-api/repositories/member-repository.test.js index a3238a7c1c4..70d5530d3b8 100644 --- a/ghost/core/test/unit/server/services/members/members-api/repositories/member-repository.test.js +++ b/ghost/core/test/unit/server/services/members/members-api/repositories/member-repository.test.js @@ -1,4 +1,3 @@ -require('should'); const assert = require('node:assert/strict'); const sinon = require('sinon'); const errors = require('@tryghost/errors'); diff --git a/ghost/core/test/unit/server/services/members/members-api/services/geolocation-service.test.js b/ghost/core/test/unit/server/services/members/members-api/services/geolocation-service.test.js index 05d90cfa566..6fd7804e7b9 100644 --- a/ghost/core/test/unit/server/services/members/members-api/services/geolocation-service.test.js +++ b/ghost/core/test/unit/server/services/members/members-api/services/geolocation-service.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../../../utils/assertions'); const nock = require('nock'); -const should = require('should'); const GeolocationService = require('../../../../../../../core/server/services/members/members-api/services/geolocation-service'); const RESPONSE = { diff --git a/ghost/core/test/unit/server/services/members/middleware.test.js b/ghost/core/test/unit/server/services/members/middleware.test.js index b1cc2feb5d7..2b5dadff5f2 100644 --- a/ghost/core/test/unit/server/services/members/middleware.test.js +++ b/ghost/core/test/unit/server/services/members/middleware.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const urlUtils = require('../../../../../core/shared/url-utils'); diff --git a/ghost/core/test/unit/server/services/members/request-integrity-token-provider.test.js b/ghost/core/test/unit/server/services/members/request-integrity-token-provider.test.js index d5d3f4f4820..ca0517efe04 100644 --- a/ghost/core/test/unit/server/services/members/request-integrity-token-provider.test.js +++ b/ghost/core/test/unit/server/services/members/request-integrity-token-provider.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const sinon = require('sinon'); -const should = require('should'); const RequestIntegrityTokenProvider = require('../../../../../core/server/services/members/request-integrity-token-provider'); diff --git a/ghost/core/test/unit/server/services/members/stripe-connect.test.js b/ghost/core/test/unit/server/services/members/stripe-connect.test.js index fbc04d5c527..fa200fb2e3e 100644 --- a/ghost/core/test/unit/server/services/members/stripe-connect.test.js +++ b/ghost/core/test/unit/server/services/members/stripe-connect.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const stripeConnect = require('../../../../../core/server/services/members/stripe-connect'); describe('Members - Stripe Connect', function () { diff --git a/ghost/core/test/unit/server/services/members/utils.test.js b/ghost/core/test/unit/server/services/members/utils.test.js index 36ce80963c3..926801ad9bf 100644 --- a/ghost/core/test/unit/server/services/members/utils.test.js +++ b/ghost/core/test/unit/server/services/members/utils.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const sinon = require('sinon'); -const should = require('should'); const {formattedMemberResponse} = require('../../../../../core/server/services/members/utils'); const labs = require('../../../../../core/shared/labs'); diff --git a/ghost/core/test/unit/server/services/notifications/notifications.test.js b/ghost/core/test/unit/server/services/notifications/notifications.test.js index 39adca2a73d..fa96f882a13 100644 --- a/ghost/core/test/unit/server/services/notifications/notifications.test.js +++ b/ghost/core/test/unit/server/services/notifications/notifications.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const ghostVersion = require('@tryghost/version'); diff --git a/ghost/core/test/unit/server/services/offers/application/unique-checker.test.js b/ghost/core/test/unit/server/services/offers/application/unique-checker.test.js index bc73fbc6ecf..d2157dee093 100644 --- a/ghost/core/test/unit/server/services/offers/application/unique-checker.test.js +++ b/ghost/core/test/unit/server/services/offers/application/unique-checker.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const sinon = require('sinon'); -const should = require('should'); const UniqueChecker = require('../../../../../../core/server/services/offers/application/unique-checker'); describe('UniqueChecker', function () { diff --git a/ghost/core/test/unit/server/services/offers/domain/models/offer-amount.test.js b/ghost/core/test/unit/server/services/offers/domain/models/offer-amount.test.js index 5d5c4748d00..ea2ec2c6cc2 100644 --- a/ghost/core/test/unit/server/services/offers/domain/models/offer-amount.test.js +++ b/ghost/core/test/unit/server/services/offers/domain/models/offer-amount.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const {OfferPercentageAmount, OfferFixedAmount, OfferTrialAmount, OfferFreeMonthsAmount} = require('../../../../../../../core/server/services/offers/domain/models/offer-amount'); diff --git a/ghost/core/test/unit/server/services/offers/domain/models/offer-cadence.test.js b/ghost/core/test/unit/server/services/offers/domain/models/offer-cadence.test.js index ce79e4085f2..624cbdb22d3 100644 --- a/ghost/core/test/unit/server/services/offers/domain/models/offer-cadence.test.js +++ b/ghost/core/test/unit/server/services/offers/domain/models/offer-cadence.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const OfferCadence = require('../../../../../../../core/server/services/offers/domain/models/offer-cadence'); diff --git a/ghost/core/test/unit/server/services/offers/domain/models/offer-code.test.js b/ghost/core/test/unit/server/services/offers/domain/models/offer-code.test.js index fb8eeefc808..02169890665 100644 --- a/ghost/core/test/unit/server/services/offers/domain/models/offer-code.test.js +++ b/ghost/core/test/unit/server/services/offers/domain/models/offer-code.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const OfferCode = require('../../../../../../../core/server/services/offers/domain/models/offer-code'); diff --git a/ghost/core/test/unit/server/services/offers/domain/models/offer-currency.test.js b/ghost/core/test/unit/server/services/offers/domain/models/offer-currency.test.js index 2b5ca8b266d..0c0f25146fe 100644 --- a/ghost/core/test/unit/server/services/offers/domain/models/offer-currency.test.js +++ b/ghost/core/test/unit/server/services/offers/domain/models/offer-currency.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const OfferCurrency = require('../../../../../../../core/server/services/offers/domain/models/offer-currency'); diff --git a/ghost/core/test/unit/server/services/offers/domain/models/offer-description.test.js b/ghost/core/test/unit/server/services/offers/domain/models/offer-description.test.js index 6e97e1b768a..1fb398d5128 100644 --- a/ghost/core/test/unit/server/services/offers/domain/models/offer-description.test.js +++ b/ghost/core/test/unit/server/services/offers/domain/models/offer-description.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const OfferDescription = require('../../../../../../../core/server/services/offers/domain/models/offer-description'); diff --git a/ghost/core/test/unit/server/services/offers/domain/models/offer-duration.test.js b/ghost/core/test/unit/server/services/offers/domain/models/offer-duration.test.js index e22b8a7f4c6..248dfcfeb87 100644 --- a/ghost/core/test/unit/server/services/offers/domain/models/offer-duration.test.js +++ b/ghost/core/test/unit/server/services/offers/domain/models/offer-duration.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const OfferDuration = require('../../../../../../../core/server/services/offers/domain/models/offer-duration'); diff --git a/ghost/core/test/unit/server/services/offers/domain/models/offer-name.test.js b/ghost/core/test/unit/server/services/offers/domain/models/offer-name.test.js index cbcd4f50f95..e56509b651d 100644 --- a/ghost/core/test/unit/server/services/offers/domain/models/offer-name.test.js +++ b/ghost/core/test/unit/server/services/offers/domain/models/offer-name.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const OfferName = require('../../../../../../../core/server/services/offers/domain/models/offer-name'); diff --git a/ghost/core/test/unit/server/services/offers/domain/models/offer-redemption-type.test.js b/ghost/core/test/unit/server/services/offers/domain/models/offer-redemption-type.test.js index 79c59e3bea4..edd067c7646 100644 --- a/ghost/core/test/unit/server/services/offers/domain/models/offer-redemption-type.test.js +++ b/ghost/core/test/unit/server/services/offers/domain/models/offer-redemption-type.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const OfferRedemptionType = require('../../../../../../../core/server/services/offers/domain/models/offer-redemption-type'); diff --git a/ghost/core/test/unit/server/services/offers/domain/models/offer-status.test.js b/ghost/core/test/unit/server/services/offers/domain/models/offer-status.test.js index 5b26c50100e..9bb095626d8 100644 --- a/ghost/core/test/unit/server/services/offers/domain/models/offer-status.test.js +++ b/ghost/core/test/unit/server/services/offers/domain/models/offer-status.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const OfferStatus = require('../../../../../../../core/server/services/offers/domain/models/offer-status'); diff --git a/ghost/core/test/unit/server/services/offers/domain/models/offer-title.test.js b/ghost/core/test/unit/server/services/offers/domain/models/offer-title.test.js index 289df19fdd8..db4bfd39e57 100644 --- a/ghost/core/test/unit/server/services/offers/domain/models/offer-title.test.js +++ b/ghost/core/test/unit/server/services/offers/domain/models/offer-title.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const OfferTitle = require('../../../../../../../core/server/services/offers/domain/models/offer-title'); diff --git a/ghost/core/test/unit/server/services/offers/domain/models/offer-type.test.js b/ghost/core/test/unit/server/services/offers/domain/models/offer-type.test.js index f33bbe91116..095ee029484 100644 --- a/ghost/core/test/unit/server/services/offers/domain/models/offer-type.test.js +++ b/ghost/core/test/unit/server/services/offers/domain/models/offer-type.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const OfferType = require('../../../../../../../core/server/services/offers/domain/models/offer-type'); diff --git a/ghost/core/test/unit/server/services/offers/domain/models/offer.test.js b/ghost/core/test/unit/server/services/offers/domain/models/offer.test.js index 45dc9294a52..49282ddf8d2 100644 --- a/ghost/core/test/unit/server/services/offers/domain/models/offer.test.js +++ b/ghost/core/test/unit/server/services/offers/domain/models/offer.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../../../utils/assertions'); -const should = require('should'); const ObjectID = require('bson-objectid').default; const errors = require('../../../../../../../core/server/services/offers/domain/errors'); const Offer = require('../../../../../../../core/server/services/offers/domain/models/offer'); diff --git a/ghost/core/test/unit/server/services/offers/domain/models/stripe-coupon.test.js b/ghost/core/test/unit/server/services/offers/domain/models/stripe-coupon.test.js index 072fddc1b0c..5d480d40001 100644 --- a/ghost/core/test/unit/server/services/offers/domain/models/stripe-coupon.test.js +++ b/ghost/core/test/unit/server/services/offers/domain/models/stripe-coupon.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const StripeCoupon = require('../../../../../../../core/server/services/offers/domain/models/stripe-coupon'); describe('StripeCoupon', function () { diff --git a/ghost/core/test/unit/server/services/permissions/can-this.test.js b/ghost/core/test/unit/server/services/permissions/can-this.test.js index ba7a49566b4..f2c839015f1 100644 --- a/ghost/core/test/unit/server/services/permissions/can-this.test.js +++ b/ghost/core/test/unit/server/services/permissions/can-this.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../utils'); const _ = require('lodash'); diff --git a/ghost/core/test/unit/server/services/permissions/index.test.js b/ghost/core/test/unit/server/services/permissions/index.test.js index 72c4ef8524d..6ef2923cb7a 100644 --- a/ghost/core/test/unit/server/services/permissions/index.test.js +++ b/ghost/core/test/unit/server/services/permissions/index.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../utils'); const _ = require('lodash'); diff --git a/ghost/core/test/unit/server/services/permissions/parse-context.test.js b/ghost/core/test/unit/server/services/permissions/parse-context.test.js index 71ee31c80f7..8f3239a95de 100644 --- a/ghost/core/test/unit/server/services/permissions/parse-context.test.js +++ b/ghost/core/test/unit/server/services/permissions/parse-context.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const parseContext = require('../../../../../core/server/services/permissions/parse-context'); describe('Permissions', function () { diff --git a/ghost/core/test/unit/server/services/permissions/providers.test.js b/ghost/core/test/unit/server/services/permissions/providers.test.js index 39773402fb9..62e69f86430 100644 --- a/ghost/core/test/unit/server/services/permissions/providers.test.js +++ b/ghost/core/test/unit/server/services/permissions/providers.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../utils'); const models = require('../../../../../core/server/models'); diff --git a/ghost/core/test/unit/server/services/route-settings/route-settings.test.js b/ghost/core/test/unit/server/services/route-settings/route-settings.test.js index b04e7713948..1d52f467705 100644 --- a/ghost/core/test/unit/server/services/route-settings/route-settings.test.js +++ b/ghost/core/test/unit/server/services/route-settings/route-settings.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const sinon = require('sinon'); -const should = require('should'); const fs = require('fs-extra'); const path = require('path'); const bridge = require('../../../../../core/bridge'); diff --git a/ghost/core/test/unit/server/services/route-settings/settings-loader.test.js b/ghost/core/test/unit/server/services/route-settings/settings-loader.test.js index 6b4bd7b9d24..d33e78af18e 100644 --- a/ghost/core/test/unit/server/services/route-settings/settings-loader.test.js +++ b/ghost/core/test/unit/server/services/route-settings/settings-loader.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); const sinon = require('sinon'); -const should = require('should'); const rewire = require('rewire'); const fs = require('fs-extra'); const path = require('path'); diff --git a/ghost/core/test/unit/server/services/route-settings/validate.test.js b/ghost/core/test/unit/server/services/route-settings/validate.test.js index e68c6765910..c5020a9e937 100644 --- a/ghost/core/test/unit/server/services/route-settings/validate.test.js +++ b/ghost/core/test/unit/server/services/route-settings/validate.test.js @@ -1,10 +1,7 @@ const assert = require('node:assert/strict'); -const should = require('should'); const errors = require('@tryghost/errors'); const validate = require('../../../../../core/server/services/route-settings/validate'); -should.equal(true, true); - describe('UNIT: services/settings/validate', function () { it('no type definitions / empty yaml file', function () { const object = validate({}); diff --git a/ghost/core/test/unit/server/services/settings-helpers/settings-helpers.test.js b/ghost/core/test/unit/server/services/settings-helpers/settings-helpers.test.js index 09ec153c642..1e1847ca57f 100644 --- a/ghost/core/test/unit/server/services/settings-helpers/settings-helpers.test.js +++ b/ghost/core/test/unit/server/services/settings-helpers/settings-helpers.test.js @@ -1,4 +1,3 @@ -const should = require('should'); const sinon = require('sinon'); const configUtils = require('../../../../utils/config-utils'); const SettingsHelpers = require('../../../../../core/server/services/settings-helpers/settings-helpers'); diff --git a/ghost/core/test/unit/server/services/settings/default-settings-manager.test.js b/ghost/core/test/unit/server/services/settings/default-settings-manager.test.js index 9457cf5542e..e2db7c148de 100644 --- a/ghost/core/test/unit/server/services/settings/default-settings-manager.test.js +++ b/ghost/core/test/unit/server/services/settings/default-settings-manager.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); const sinon = require('sinon'); -const should = require('should'); const fs = require('fs-extra'); const path = require('path'); const DefaultSettingsManager = require('../../../../../core/server/services/route-settings/default-settings-manager'); diff --git a/ghost/core/test/unit/server/services/settings/settings-bread-service.test.js b/ghost/core/test/unit/server/services/settings/settings-bread-service.test.js index 3e316216bba..c358fa4f529 100644 --- a/ghost/core/test/unit/server/services/settings/settings-bread-service.test.js +++ b/ghost/core/test/unit/server/services/settings/settings-bread-service.test.js @@ -4,7 +4,6 @@ const mail = require('../../../../../core/server/services/mail'); const SettingsBreadService = require('../../../../../core/server/services/settings/settings-bread-service'); const urlUtils = require('../../../../../core/shared/url-utils.js'); const {mockManager} = require('../../../../utils/e2e-framework'); -const should = require('should'); const emailAddress = require('../../../../../core/server/services/email-address'); describe('UNIT > Settings BREAD Service:', function () { let emailMockReceiver; diff --git a/ghost/core/test/unit/server/services/settings/settings-utils.test.js b/ghost/core/test/unit/server/services/settings/settings-utils.test.js index 48689b829b1..b4d1a100399 100644 --- a/ghost/core/test/unit/server/services/settings/settings-utils.test.js +++ b/ghost/core/test/unit/server/services/settings/settings-utils.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const sinon = require('sinon'); -const should = require('should'); describe('Unit: services/settings/settings-utils', function () { describe('getOrGenerateSiteUuid', function () { diff --git a/ghost/core/test/unit/server/services/staff/staff-service.test.js b/ghost/core/test/unit/server/services/staff/staff-service.test.js index 096f553a952..87fb834158a 100644 --- a/ghost/core/test/unit/server/services/staff/staff-service.test.js +++ b/ghost/core/test/unit/server/services/staff/staff-service.test.js @@ -8,7 +8,6 @@ const MilestoneCreatedEvent = require('../../../../../core/server/services/miles // Stuff we are testing const DomainEvents = require('@tryghost/domain-events'); -require('should'); const StaffService = require('../../../../../core/server/services/staff/staff-service'); function testCommonMailData({mailStub, getEmailAlertUsersStub}) { diff --git a/ghost/core/test/unit/server/services/stats/content.test.js b/ghost/core/test/unit/server/services/stats/content.test.js index c13754da50e..69b86837ce6 100644 --- a/ghost/core/test/unit/server/services/stats/content.test.js +++ b/ghost/core/test/unit/server/services/stats/content.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); const sinon = require('sinon'); -const should = require('should'); const ContentStatsService = require('../../../../../core/server/services/stats/content-stats-service'); const tinybird = require('../../../../../core/server/services/stats/utils/tinybird'); diff --git a/ghost/core/test/unit/server/services/stats/mrr.test.js b/ghost/core/test/unit/server/services/stats/mrr.test.js index 2d9ffe3973c..18c859d8df4 100644 --- a/ghost/core/test/unit/server/services/stats/mrr.test.js +++ b/ghost/core/test/unit/server/services/stats/mrr.test.js @@ -3,7 +3,6 @@ const MrrStatsService = require('../../../../../core/server/services/stats/mrr-s const moment = require('moment'); const sinon = require('sinon'); const knex = require('knex').default; -const should = require('should'); describe('MrrStatsService', function () { describe('getHistory', function () { diff --git a/ghost/core/test/unit/server/services/stripe/config.test.js b/ghost/core/test/unit/server/services/stripe/config.test.js index df3eb454f5c..47bc2018b9c 100644 --- a/ghost/core/test/unit/server/services/stripe/config.test.js +++ b/ghost/core/test/unit/server/services/stripe/config.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const UrlUtils = require('@tryghost/url-utils'); diff --git a/ghost/core/test/unit/server/services/stripe/stripe-api.test.js b/ghost/core/test/unit/server/services/stripe/stripe-api.test.js index ab4aea2dfdc..2c3cfc08a96 100644 --- a/ghost/core/test/unit/server/services/stripe/stripe-api.test.js +++ b/ghost/core/test/unit/server/services/stripe/stripe-api.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); const sinon = require('sinon'); -const should = require('should'); const rewire = require('rewire'); const StripeAPI = rewire('../../../../../core/server/services/stripe/stripe-api'); diff --git a/ghost/core/test/unit/server/services/themes/loader.test.js b/ghost/core/test/unit/server/services/themes/loader.test.js index af0bbd4f18f..e72733c0b02 100644 --- a/ghost/core/test/unit/server/services/themes/loader.test.js +++ b/ghost/core/test/unit/server/services/themes/loader.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const fs = require('fs-extra'); const tmp = require('tmp'); diff --git a/ghost/core/test/unit/server/services/themes/validate.test.js b/ghost/core/test/unit/server/services/themes/validate.test.js index 48d55037471..5de8beebe77 100644 --- a/ghost/core/test/unit/server/services/themes/validate.test.js +++ b/ghost/core/test/unit/server/services/themes/validate.test.js @@ -1,4 +1,3 @@ -const should = require('should'); const sinon = require('sinon'); const validate = require('../../../../../core/server/services/themes/validate'); const list = require('../../../../../core/server/services/themes/list'); diff --git a/ghost/core/test/unit/server/services/update-check.test.js b/ghost/core/test/unit/server/services/update-check.test.js index 253496cafbe..6e074374cff 100644 --- a/ghost/core/test/unit/server/services/update-check.test.js +++ b/ghost/core/test/unit/server/services/update-check.test.js @@ -1,4 +1,3 @@ -require('should'); const sinon = require('sinon'); const nock = require('nock'); const moment = require('moment'); diff --git a/ghost/core/test/unit/server/services/url/local-file-cache.test.js b/ghost/core/test/unit/server/services/url/local-file-cache.test.js index ab928e54403..576f793f711 100644 --- a/ghost/core/test/unit/server/services/url/local-file-cache.test.js +++ b/ghost/core/test/unit/server/services/url/local-file-cache.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const fs = require('fs-extra'); diff --git a/ghost/core/test/unit/server/services/url/queue.test.js b/ghost/core/test/unit/server/services/url/queue.test.js index 23416c17018..9de79e9900c 100644 --- a/ghost/core/test/unit/server/services/url/queue.test.js +++ b/ghost/core/test/unit/server/services/url/queue.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); const _ = require('lodash'); -const should = require('should'); const sinon = require('sinon'); const logging = require('@tryghost/logging'); const Queue = require('../../../../../core/server/services/url/queue'); diff --git a/ghost/core/test/unit/server/services/url/url-generator.test.js b/ghost/core/test/unit/server/services/url/url-generator.test.js index 30e33f8aaed..110d62d6b4b 100644 --- a/ghost/core/test/unit/server/services/url/url-generator.test.js +++ b/ghost/core/test/unit/server/services/url/url-generator.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const urlUtils = require('../../../../../core/shared/url-utils'); const UrlGenerator = require('../../../../../core/server/services/url/url-generator'); diff --git a/ghost/core/test/unit/server/services/url/url-service.test.js b/ghost/core/test/unit/server/services/url/url-service.test.js index 77173492224..d461a309454 100644 --- a/ghost/core/test/unit/server/services/url/url-service.test.js +++ b/ghost/core/test/unit/server/services/url/url-service.test.js @@ -2,7 +2,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); const errors = require('@tryghost/errors'); const rewire = require('rewire'); -const should = require('should'); const sinon = require('sinon'); const Queue = require('../../../../../core/server/services/url/queue'); const Resources = require('../../../../../core/server/services/url/resources'); diff --git a/ghost/core/test/unit/server/services/url/urls.test.js b/ghost/core/test/unit/server/services/url/urls.test.js index a5865d6bbc0..5dd78b5cb3b 100644 --- a/ghost/core/test/unit/server/services/url/urls.test.js +++ b/ghost/core/test/unit/server/services/url/urls.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const events = require('../../../../../core/server/lib/common/events'); const Urls = require('../../../../../core/server/services/url/urls'); diff --git a/ghost/core/test/unit/server/services/verification-trigger.test.js b/ghost/core/test/unit/server/services/verification-trigger.test.js index ea8f855d7b6..3863afc574b 100644 --- a/ghost/core/test/unit/server/services/verification-trigger.test.js +++ b/ghost/core/test/unit/server/services/verification-trigger.test.js @@ -2,7 +2,6 @@ // const testUtils = require('./utils'); const sinon = require('sinon'); const assert = require('node:assert/strict'); -require('should'); const VerificationTrigger = require('../../../../core/server/services/verification-trigger'); const DomainEvents = require('@tryghost/domain-events'); const {MemberCreatedEvent} = require('../../../../core/shared/events'); diff --git a/ghost/core/test/unit/server/services/webhooks/webhook-service.test.js b/ghost/core/test/unit/server/services/webhooks/webhook-service.test.js index 6064374f87b..f4b82b09dd9 100644 --- a/ghost/core/test/unit/server/services/webhooks/webhook-service.test.js +++ b/ghost/core/test/unit/server/services/webhooks/webhook-service.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const createWebhookService = require('../../../../../core/server/services/webhooks/webhooks-service'); diff --git a/ghost/core/test/unit/server/web/admin/controller.test.js b/ghost/core/test/unit/server/web/admin/controller.test.js index 206fc0ada44..1bc2ac6c49a 100644 --- a/ghost/core/test/unit/server/web/admin/controller.test.js +++ b/ghost/core/test/unit/server/web/admin/controller.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -require('should'); const sinon = require('sinon'); const path = require('path'); const configUtils = require('../../../../utils/config-utils'); diff --git a/ghost/core/test/unit/server/web/api/canary/content/middleware.test.js b/ghost/core/test/unit/server/web/api/canary/content/middleware.test.js index 43e4640404f..c9045928b37 100644 --- a/ghost/core/test/unit/server/web/api/canary/content/middleware.test.js +++ b/ghost/core/test/unit/server/web/api/canary/content/middleware.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../../../utils/assertions'); -const should = require('should'); const middleware = require('../../../../../../../core/server/web/api/endpoints/content/middleware'); describe('Content API middleware', function () { diff --git a/ghost/core/test/unit/server/web/api/middleware/cors.test.js b/ghost/core/test/unit/server/web/api/middleware/cors.test.js index 31193a032b2..b11ff7558a1 100644 --- a/ghost/core/test/unit/server/web/api/middleware/cors.test.js +++ b/ghost/core/test/unit/server/web/api/middleware/cors.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const rewire = require('rewire'); const configUtils = require('../../../../../utils/config-utils'); diff --git a/ghost/core/test/unit/server/web/api/middleware/update-user-last-seen.test.js b/ghost/core/test/unit/server/web/api/middleware/update-user-last-seen.test.js index 3b6c8010de4..a2ce7b40a56 100644 --- a/ghost/core/test/unit/server/web/api/middleware/update-user-last-seen.test.js +++ b/ghost/core/test/unit/server/web/api/middleware/update-user-last-seen.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const sinon = require('sinon'); const moment = require('moment'); const updateUserLastSeenMiddleware = require('../../../../../../core/server/web/api/middleware/update-user-last-seen'); diff --git a/ghost/core/test/unit/server/web/parent/middleware/ghost-locals.test.js b/ghost/core/test/unit/server/web/parent/middleware/ghost-locals.test.js index eaa93558b95..0fd3d454d46 100644 --- a/ghost/core/test/unit/server/web/parent/middleware/ghost-locals.test.js +++ b/ghost/core/test/unit/server/web/parent/middleware/ghost-locals.test.js @@ -1,7 +1,6 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../../utils/assertions'); const _ = require('lodash'); -const should = require('should'); const sinon = require('sinon'); const ghostLocals = require('../../../../../../core/server/web/parent/middleware/ghost-locals'); diff --git a/ghost/core/test/unit/server/web/parent/middleware/request-id.test.js b/ghost/core/test/unit/server/web/parent/middleware/request-id.test.js index 94466c99a05..2af39cd4206 100644 --- a/ghost/core/test/unit/server/web/parent/middleware/request-id.test.js +++ b/ghost/core/test/unit/server/web/parent/middleware/request-id.test.js @@ -1,6 +1,5 @@ const assert = require('node:assert/strict'); const {assertExists} = require('../../../../../utils/assertions'); -const should = require('should'); const sinon = require('sinon'); const validator = require('@tryghost/validator'); diff --git a/ghost/core/test/unit/shared/config/helpers.test.js b/ghost/core/test/unit/shared/config/helpers.test.js index 209bc1c5b62..c2833c3936d 100644 --- a/ghost/core/test/unit/shared/config/helpers.test.js +++ b/ghost/core/test/unit/shared/config/helpers.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -require('should'); const configUtils = require('../../../utils/config-utils'); describe('vhost utils', function () { diff --git a/ghost/core/test/unit/shared/config/loader.test.js b/ghost/core/test/unit/shared/config/loader.test.js index ecf34a5c182..38216845f16 100644 --- a/ghost/core/test/unit/shared/config/loader.test.js +++ b/ghost/core/test/unit/shared/config/loader.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const path = require('path'); const rewire = require('rewire'); const _ = require('lodash'); diff --git a/ghost/core/test/unit/shared/config/utils.test.js b/ghost/core/test/unit/shared/config/utils.test.js index 3eb2267b1db..a29fbed445c 100644 --- a/ghost/core/test/unit/shared/config/utils.test.js +++ b/ghost/core/test/unit/shared/config/utils.test.js @@ -1,5 +1,4 @@ const assert = require('node:assert/strict'); -const should = require('should'); const _ = require('lodash'); const configUtils = require('../../../../core/shared/config/utils'); diff --git a/yarn.lock b/yarn.lock index c63707f99e0..3f0dc848051 100644 --- a/yarn.lock +++ b/yarn.lock @@ -30698,50 +30698,6 @@ shimmer@^1.2.1: resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337" integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw== -should-equal@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/should-equal/-/should-equal-2.0.0.tgz#6072cf83047360867e68e98b09d71143d04ee0c3" - integrity sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA== - dependencies: - should-type "^1.4.0" - -should-format@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/should-format/-/should-format-3.0.3.tgz#9bfc8f74fa39205c53d38c34d717303e277124f1" - integrity sha512-hZ58adtulAk0gKtua7QxevgUaXTTXxIi8t41L3zo9AHvjXO1/7sdLECuHeIN2SRtYXpNkmhoUP2pdeWgricQ+Q== - dependencies: - should-type "^1.3.0" - should-type-adaptors "^1.0.1" - -should-type-adaptors@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz#401e7f33b5533033944d5cd8bf2b65027792e27a" - integrity sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA== - dependencies: - should-type "^1.3.0" - should-util "^1.0.0" - -should-type@^1.3.0, should-type@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/should-type/-/should-type-1.4.0.tgz#0756d8ce846dfd09843a6947719dfa0d4cff5cf3" - integrity sha512-MdAsTu3n25yDbIe1NeN69G4n6mUnJGtSJHygX3+oN0ZbO3DTiATnf7XnYJdGT42JCXurTb1JI0qOBR65shvhPQ== - -should-util@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/should-util/-/should-util-1.0.1.tgz#fb0d71338f532a3a149213639e2d32cbea8bcb28" - integrity sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g== - -should@13.2.3: - version "13.2.3" - resolved "https://registry.yarnpkg.com/should/-/should-13.2.3.tgz#96d8e5acf3e97b49d89b51feaa5ae8d07ef58f10" - integrity sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ== - dependencies: - should-equal "^2.0.0" - should-format "^3.0.3" - should-type "^1.4.0" - should-type-adaptors "^1.0.1" - should-util "^1.0.0" - side-channel-list@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad" From 60a78ea6ef4ba6a5a79093566802ebf42ba466eb Mon Sep 17 00:00:00 2001 From: Chris Raible Date: Wed, 18 Feb 2026 18:12:32 -0800 Subject: [PATCH 4/4] Improved stability of browser tests that depend on Stripe Checkout (#26501) refs https://github.com/TryGhost/Ghost/actions/runs/22159115008/job/64071040152 Portal donations tests were flaking fairly frequently in CI. The `submitStripePayment` flow in e2e-browser-utils was clicking on the submit button in Stripe Checkout and then exiting. This prematurely started subsequent assertions in the tests, before the redirect back to Ghost had completed. This fixes that by waiting for the url to no longer include stripe.checkout.com, indicating that the redirect back to Ghost has completed, and only then starting the assertions in the tests themselves. This fix was in response to flaky donations tests, but it should also improve the reliability of any test that uses Stripe checkout: - ghost/core/test/e2e-browser/portal/donations.spec.js - ghost/core/test/e2e-browser/portal/tiers.spec.js - ghost/core/test/e2e-browser/portal/upgrade.spec.js - ghost/core/test/e2e-browser/portal/offers.spec.js --- .../e2e-browser/utils/e2e-browser-utils.js | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/ghost/core/test/e2e-browser/utils/e2e-browser-utils.js b/ghost/core/test/e2e-browser/utils/e2e-browser-utils.js index 071877975d5..b63f0ff0430 100644 --- a/ghost/core/test/e2e-browser/utils/e2e-browser-utils.js +++ b/ghost/core/test/e2e-browser/utils/e2e-browser-utils.js @@ -351,10 +351,34 @@ const submitStripePayment = async (page) => { } } - // Wait for submit button complete - await page.waitForSelector('[data-testid="hosted-payment-submit-button"].SubmitButton--complete', {state: 'attached'}); + /** + * Retry submit in case Stripe leaves checkout in a transient state. + */ + for (let attempt = 1; attempt <= 3; attempt++) { + if (!page.url().includes('checkout.stripe.com')) { + return; + } - await page.getByTestId('hosted-payment-submit-button').click(); + try { + // Wait for submit button complete + await page.waitForSelector('[data-testid="hosted-payment-submit-button"].SubmitButton--complete', { + state: 'attached', + timeout: 5_000 + }); + await page.getByTestId('hosted-payment-submit-button').click(); + + // Stripe can redirect without reaching "load"; "commit" catches early URL change. + await page.waitForURL(url => !url.hostname.includes('checkout.stripe.com'), { + timeout: 25_000, + waitUntil: 'commit' + }); + return; + } catch (err) { + if (attempt === 3) { + throw err; + } + } + } }; /**