diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f0e23263db..7eab1f490c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -54,4 +54,4 @@ jobs: run: yarn intl:build - name: Run tests run: | - NODE_ENV=test EXPO_PUBLIC_ENV=test yarn test --forceExit + NODE_ENV=test yarn test --forceExit diff --git a/Makefile b/Makefile index a40d37610e..5ed24e6ada 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ build-web-embed: ## Compile web embed bundle, copy to bskyweb/embedr* directorie .PHONY: test test: ## Run all tests - NODE_ENV=test EXPO_PUBLIC_ENV=test yarn test + NODE_ENV=test yarn test .PHONY: lint lint: ## Run style checks and verify syntax diff --git a/index.js b/index.js index 2f13ce1ea1..f5f3a07ac3 100644 --- a/index.js +++ b/index.js @@ -5,9 +5,8 @@ import {LogBox} from 'react-native' import {registerRootComponent} from 'expo' import App from '#/App' -import {IS_TEST} from '#/env' -if (IS_TEST) { +if (process.env.NODE_ENV === 'test') { LogBox.ignoreAllLogs() // suppress all logs in tests } else { LogBox.ignoreLogs(['Require cycle:']) // suppress require-cycle warnings, it's fine diff --git a/src/env.ts b/src/env.ts index fbcc15f576..4d1b55a4ee 100644 --- a/src/env.ts +++ b/src/env.ts @@ -1,4 +1,3 @@ -export const IS_TEST = process.env.EXPO_PUBLIC_ENV === 'test' export const IS_DEV = __DEV__ export const IS_PROD = !IS_DEV export const LOG_DEBUG = process.env.EXPO_PUBLIC_LOG_DEBUG || '' diff --git a/src/logger/README.md b/src/logger/README.md index 1dfd5da23d..17dd61cb39 100644 --- a/src/logger/README.md +++ b/src/logger/README.md @@ -18,7 +18,7 @@ logger.error(error[, metadata]) #### Modes The "modes" referred to here are inferred from the values exported from `#/env`. -Basically, the booleans `IS_DEV`, `IS_TEST`, and `IS_PROD`. +Basically, the booleans `IS_DEV` and `IS_PROD`. #### Log Levels diff --git a/src/logger/__tests__/logger.test.ts b/src/logger/__tests__/logger.test.ts index a3ccd037d5..02039d26e9 100644 --- a/src/logger/__tests__/logger.test.ts +++ b/src/logger/__tests__/logger.test.ts @@ -5,7 +5,6 @@ import {nanoid} from 'nanoid/non-secure' import {Logger, LogLevel, sentryTransport} from '#/logger' jest.mock('#/env', () => ({ - IS_TEST: true, IS_DEV: false, IS_PROD: false, /* diff --git a/src/logger/index.ts b/src/logger/index.ts index 02e5d5f257..d99bfeb131 100644 --- a/src/logger/index.ts +++ b/src/logger/index.ts @@ -173,7 +173,7 @@ export class Logger { protected debugContextRegexes: RegExp[] = [] constructor({ - enabled = !env.IS_TEST, + enabled = process.env.NODE_ENV !== 'test', level = env.LOG_LEVEL as LogLevel, debug = env.LOG_DEBUG || '', }: { @@ -266,11 +266,11 @@ export class Logger { */ export const logger = new Logger() -if (!env.IS_TEST) { +if (process.env.NODE_ENV !== 'test') { logger.addTransport(createBitdriftTransport()) } -if (env.IS_DEV && !env.IS_TEST) { +if (env.IS_DEV && process.env.NODE_ENV !== 'test') { logger.addTransport(consoleTransport) /* diff --git a/src/view/com/util/Toast.tsx b/src/view/com/util/Toast.tsx index b57e676aea..7dc6837e23 100644 --- a/src/view/com/util/Toast.tsx +++ b/src/view/com/util/Toast.tsx @@ -25,7 +25,6 @@ import { import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback' import {atoms as a, useTheme} from '#/alf' import {Text} from '#/components/Typography' -import {IS_TEST} from '#/env' const TIMEOUT = 2e3 @@ -33,7 +32,9 @@ export function show( message: string, icon: FontAwesomeProps['icon'] = 'check', ) { - if (IS_TEST) return + if (process.env.NODE_ENV === 'test') { + return + } AccessibilityInfo.announceForAccessibility(message) const item = new RootSiblings( item.destroy()} />,