Skip to content

Commit

Permalink
Merge pull request #487 from anshg1214/fix-tests
Browse files Browse the repository at this point in the history
Fix failing tests and Migrate to Node 20
  • Loading branch information
yvanzo committed Sep 5, 2023
2 parents 5e2ebee + bb8c734 commit 133ab1f
Show file tree
Hide file tree
Showing 5 changed files with 370 additions and 359 deletions.
10 changes: 7 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,13 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*

# Node
RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - \
&& apt-get install -y nodejs \
&& rm -rf /var/lib/apt/lists/*
ARG NODE_MAJOR=20
RUN mkdir -p /etc/apt/keyrings \
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
&& apt-get update \
&& apt-get install -y nodejs \
&& rm -rf /var/lib/apt/lists/*

RUN pip install --upgrade pip==21.0.1

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.webpack
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16
FROM node:20

RUN mkdir /code
WORKDIR /code
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ def setUp(self):
self.bbid1 = "56efa555-abd5-4ccb-89a6-ff9d9021971f"
self.bbid2 = "65e71f2e-7245-42df-b93e-89463a28f75c"
self.bbid3 = "0e03bc2a-2867-4687-afee-e211ece30772"
self.bbid4 = "14b910e7-c003-491b-923c-eeadd272d29b"

def test_get_literary_work_by_bbid(self):
literary_work_info = literary_work.get_literary_work_by_bbid(self.bbid1)
Expand All @@ -21,16 +22,17 @@ def test_fetch_multiple_literary_works(self):
literary_works = literary_work.fetch_multiple_literary_works([self.bbid2, self.bbid3])
self.assertEqual(len(literary_works), 2)
self.assertEqual(literary_works[self.bbid2]["bbid"], self.bbid2)
self.assertEqual(literary_works[self.bbid2]["name"], "Harry Potter and the Philosopher's Stone")
self.assertEqual(literary_works[self.bbid2]["name"], "Harry Potter and the Philosophers Stone")
self.assertEqual(literary_works[self.bbid2]["work_type"], "Novel")
self.assertEqual(literary_works[self.bbid3]["bbid"], self.bbid3)
self.assertEqual(literary_works[self.bbid3]["name"], "Oliver Twist")
self.assertEqual(literary_works[self.bbid3]["work_type"], "Novel")

def test_fetch_edition_groups_for_works(self):
edition_group_bbids_1 = literary_work.fetch_edition_groups_for_works(self.bbid2)
self.assertEqual(len(edition_group_bbids_1), 1)
self.assertEqual(len(edition_group_bbids_1), 2)
self.assertEqual(edition_group_bbids_1[0], "02ae4cfc-6412-4693-93b1-e24dce5e31f9")
self.assertEqual(edition_group_bbids_1[1], "5876d2ee-2654-4c03-a2e3-599ace14531a")

edition_group_bbids_2 = literary_work.fetch_edition_groups_for_works(self.bbid3)
edition_group_bbids_2 = literary_work.fetch_edition_groups_for_works(self.bbid4)
self.assertEqual(len(edition_group_bbids_2), 0)
Loading

0 comments on commit 133ab1f

Please sign in to comment.