Skip to content

Commit

Permalink
fix test fixtures not having lodash, renamed
Browse files Browse the repository at this point in the history
  • Loading branch information
moromis committed Apr 9, 2024
1 parent e746d94 commit 02b6386
Show file tree
Hide file tree
Showing 14 changed files with 50 additions and 11 deletions.
6 changes: 5 additions & 1 deletion src/modules/commands/assign.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ const services = require("../../services");
const strings = require("../../constants/strings");
const { TABLES } = require("../../constants/tables");
const { CHORE_STATES } = require("../../constants/chores");
const { testChores, getTestBody, getTestUsers } = require("../../test/structs");
const {
testChores,
getTestBody,
getTestUsers,
} = require("../../test-fixtures/fixtures");

jest.mock("../handler", () => jest.fn(() => {}));
jest.mock("../../services");
Expand Down
6 changes: 5 additions & 1 deletion src/modules/commands/chore.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ const globalHandler = require("../handler");
const { Client } = require("discord.js");
const services = require("../../services");
const strings = require("../../constants/strings");
const { testChores, getTestBody, getTestUsers } = require("../../test/structs");
const {
testChores,
getTestBody,
getTestUsers,
} = require("../../test-fixtures/fixtures");
const getCurrentChoreMessage = require("../../helpers/getCurrentChoreMessage");

jest.mock("../handler", () => jest.fn(() => {}));
Expand Down
6 changes: 5 additions & 1 deletion src/modules/commands/complete.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
const { data, handler, _action } = require("./complete");
const globalHandler = require("../handler");
const { Client } = require("discord.js");
const { getTestBody, testChores, getTestUsers } = require("../../test/structs");
const {
getTestBody,
testChores,
getTestUsers,
} = require("../../test-fixtures/fixtures");
const strings = require("../../constants/strings");
const getChoreCompleteMessage = require("../../helpers/getChoreCompleteMessage");
const { CHORE_STATES } = require("../../constants/chores");
Expand Down
6 changes: 5 additions & 1 deletion src/modules/commands/swap.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
const { data, handler, _action } = require("./swap");
const globalHandler = require("../handler");
const { getTestBody, testChores, getTestUsers } = require("../../test/structs");
const {
getTestBody,
testChores,
getTestUsers,
} = require("../../test-fixtures/fixtures");
const strings = require("../../constants/strings");
const { CHORE_STATES } = require("../../constants/chores");
const services = require("../../services");
Expand Down
2 changes: 1 addition & 1 deletion src/modules/jobs/daily/daily.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { handler } = require("./daily");
const { Client } = require("discord.js");
const services = require("../../../services");
const { testChores } = require("../../../test/structs");
const { testChores } = require("../../../test-fixtures/fixtures");
const {
getDMReminderMessage,
} = require("../../../helpers/getDMReminderMessage");
Expand Down
4 changes: 3 additions & 1 deletion src/modules/jobs/monthly/monthly.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ const { handler } = require("./monthly");
const { Client } = require("discord.js");
const services = require("../../../services");
const getMonthEndMessage = require("../../../helpers/getMonthEndMessage");
const { getTestUsersSortedByScoreDesc } = require("../../../test/structs");
const {
getTestUsersSortedByScoreDesc,
} = require("../../../test-fixtures/fixtures");

jest.mock("../../../services");
jest.mock("discord.js", () => ({
Expand Down
2 changes: 1 addition & 1 deletion src/modules/jobs/weekly/weekly.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { handler } = require("./weekly");
const { Client } = require("discord.js");
const services = require("../../../services");
const { testChores, getTestUsers } = require("../../../test/structs");
const { testChores, getTestUsers } = require("../../../test-fixtures/fixtures");

jest.mock("../../../services");
jest.mock("discord.js", () => ({
Expand Down
2 changes: 1 addition & 1 deletion src/services/getChores.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const {
getChore,
} = require("./getChores");
const db = require("../services/db");
const { testChores, getAllTestChores } = require("../test/structs");
const { testChores, getAllTestChores } = require("../test-fixtures/fixtures");
const { TABLES } = require("../constants/tables");

jest.mock("../services/db");
Expand Down
2 changes: 1 addition & 1 deletion src/services/unassignChores.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const {
getChore,
} = require("./getChores");
const db = require("../services/db");
const { testChores } = require("../test/structs");
const { testChores } = require("../test-fixtures/fixtures");
const { TABLES } = require("../constants/tables");
const { unassignChores } = require("./unassignChores");
const { CHORE_STATES } = require("../constants/chores");
Expand Down
2 changes: 1 addition & 1 deletion src/services/unassignCompletedChores.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { getCompletedChores } = require("./getChores");
const { testChores } = require("../test/structs");
const { testChores } = require("../test-fixtures/fixtures");
const { unassignChores } = require("./unassignChores");
const { unassignCompletedChores } = require("./unassignCompletedChores");

Expand Down
5 changes: 4 additions & 1 deletion src/services/user.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
const { getAllUsers, getUser, updateUsers } = require("./user");
const db = require("../services/db");
const { getTestDiscordUsers, getTestUsers } = require("../test/structs");
const {
getTestDiscordUsers,
getTestUsers,
} = require("../test-fixtures/fixtures");

jest.mock("../services/db");

Expand Down
File renamed without changes.
10 changes: 10 additions & 0 deletions src/test-fixtures/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "test",
"version": "1.0.0",
"main": "index.js",
"author": "Kevin Ulrich",
"license": "MIT",
"dependencies": {
"lodash": "^4.17.21"
}
}
8 changes: 8 additions & 0 deletions src/test-fixtures/yarn.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1


lodash@^4.17.21:
version "4.17.21"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==

0 comments on commit 02b6386

Please sign in to comment.