diff --git a/packages/skin-database/__mocks__/algolia.ts b/packages/skin-database/__mocks__/algolia.ts index 4475432b..beeb377a 100644 --- a/packages/skin-database/__mocks__/algolia.ts +++ b/packages/skin-database/__mocks__/algolia.ts @@ -1,3 +1,3 @@ -export const searchIndex = { +export const client = { partialUpdateObjects: jest.fn(), }; diff --git a/packages/skin-database/algolia.ts b/packages/skin-database/algolia.ts index a2870bc7..a75922b3 100644 --- a/packages/skin-database/algolia.ts +++ b/packages/skin-database/algolia.ts @@ -1,4 +1,4 @@ import { algoliasearch } from "algoliasearch"; -import { ALGOLIA_ACCOUNT, ALGOLIA_KEY, ALGOLIA_INDEX } from "./config"; +import { ALGOLIA_ACCOUNT, ALGOLIA_KEY } from "./config"; export const client = algoliasearch(ALGOLIA_ACCOUNT, ALGOLIA_KEY); diff --git a/packages/skin-database/api/__tests__/graphql.test.ts b/packages/skin-database/api/__tests__/graphql.test.ts index 749397e8..b84500e0 100644 --- a/packages/skin-database/api/__tests__/graphql.test.ts +++ b/packages/skin-database/api/__tests__/graphql.test.ts @@ -3,7 +3,7 @@ import SkinModel from "../../data/SkinModel"; import * as S3 from "../../s3"; import { processUserUploads } from "../processUserUploads"; import UserContext from "../../data/UserContext"; -import { searchIndex } from "../../algolia"; +import { client } from "../../algolia"; import { createYogaInstance } from "../../app/graphql/yoga"; import { YogaServerInstance } from "graphql-yoga"; jest.mock("../../s3"); @@ -331,9 +331,10 @@ test("Mutation.mark_skin_nsfw", async () => { type: "MARKED_SKIN_NSFW", md5: "a_fake_md5", }); - expect(searchIndex.partialUpdateObjects).toHaveBeenCalledWith([ - { nsfw: true, objectID: "a_fake_md5" }, - ]); + expect(client.partialUpdateObjects).toHaveBeenCalledWith({ + indexName: "test-index", + objects: [{ nsfw: true, objectID: "a_fake_md5" }], + }); expect(data).toEqual({ mark_skin_nsfw: true }); const skin = await SkinModel.fromMd5(ctx, "a_fake_md5"); diff --git a/packages/skin-database/config.ts b/packages/skin-database/config.ts index 50e7600f..bd02ce02 100644 --- a/packages/skin-database/config.ts +++ b/packages/skin-database/config.ts @@ -32,7 +32,7 @@ export const NODE_ENV = env("NODE_ENV") || "production"; function env(key: string): string { const value = process.env[key]; - if (value == null) { + if (!value) { throw new Error(`Expected an environment variable "${key}"`); } return value; diff --git a/packages/skin-database/jest-setup.js b/packages/skin-database/jest-setup.js index 36ff8239..8074da14 100644 --- a/packages/skin-database/jest-setup.js +++ b/packages/skin-database/jest-setup.js @@ -4,30 +4,30 @@ global.TextEncoder = TextEncoder; global.TextDecoder = TextDecoder; // In the real app, these are set via .env -process.env.LOCAL_FILE_CACHE = ""; -process.env.CLOUDFLARE_PURGE_AUTH_KEY = ""; -process.env.CAPTBARITONE_USER_ID = ""; -process.env.TEST_CHANNEL_ID = ""; -process.env.TWEET_BOT_CHANNEL_ID = ""; -process.env.SKIN_UPLOADS_CHANNEL_ID = ""; -process.env.SKIN_REVIEW_CHANNEL_ID = ""; -process.env.NSFW_SKIN_CHANNEL_ID = ""; -process.env.FEEDBACK_SKIN_CHANNEL_ID = ""; -process.env.POPULAR_TWEETS_CHANNEL_ID = ""; -process.env.DISCORD_TOKEN = ""; +process.env.LOCAL_FILE_CACHE = ""; +process.env.CLOUDFLARE_PURGE_AUTH_KEY = ""; +process.env.CAPTBARITONE_USER_ID = ""; +process.env.TEST_CHANNEL_ID = ""; +process.env.TWEET_BOT_CHANNEL_ID = ""; +process.env.SKIN_UPLOADS_CHANNEL_ID = ""; +process.env.SKIN_REVIEW_CHANNEL_ID = ""; +process.env.NSFW_SKIN_CHANNEL_ID = ""; +process.env.FEEDBACK_SKIN_CHANNEL_ID = ""; +process.env.POPULAR_TWEETS_CHANNEL_ID = ""; +process.env.DISCORD_TOKEN = ""; process.env.DISCORD_WEBAMP_SERVER_ID = ""; process.env.DISCORD_CLIENT_ID = ""; process.env.DISCORD_CLIENT_SECRET = ""; process.env.DISCORD_REDIRECT_URL = "https://api.webampskins.org/auth/discord"; process.env.LOGIN_REDIRECT_URL = "https://skins.webamp.org/review/"; -process.env.ALGOLIA_ACCOUNT = ""; -process.env.ALGOLIA_INDEX = ""; -process.env.ALGOLIA_KEY = ""; -process.env.TWITTER_API_KEY = ""; -process.env.TWITTER_API_SECRET = ""; -process.env.TWITTER_ACCESS_TOKEN = ""; -process.env.TWITTER_ACCESS_TOKEN_SECRET = ""; -process.env.INSTAGRAM_ACCESS_TOKEN = ""; -process.env.INSTAGRAM_ACCOUNT_ID = ""; -process.env.MASTODON_ACCESS_TOKEN = ""; -process.env.SECRET = ""; +process.env.ALGOLIA_ACCOUNT = "test-account"; +process.env.ALGOLIA_INDEX = "test-index"; +process.env.ALGOLIA_KEY = "test-key"; +process.env.TWITTER_API_KEY = ""; +process.env.TWITTER_API_SECRET = ""; +process.env.TWITTER_ACCESS_TOKEN = ""; +process.env.TWITTER_ACCESS_TOKEN_SECRET = ""; +process.env.INSTAGRAM_ACCESS_TOKEN = ""; +process.env.INSTAGRAM_ACCOUNT_ID = ""; +process.env.MASTODON_ACCESS_TOKEN = ""; +process.env.SECRET = "";