Skip to content

Commit

Permalink
rm server tests
Browse files Browse the repository at this point in the history
  • Loading branch information
bohendo committed Aug 12, 2022
1 parent 7e0eff6 commit cff7cb1
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 394 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ types: node-modules $(shell find modules/types $(find_options))
bash ops/maketh.sh $@

server: types $(shell find modules/server $(find_options))
bash ops/maketh.sh $@
touch modules/server/src/index.ts
bash ops/maketh.sh $@

client: types $(shell find modules/client $(find_options))
bash ops/maketh.sh $@
Expand Down
9 changes: 6 additions & 3 deletions modules/server/ops/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@ ENV HOME /root
ENV PATH $PATH:./node_modules/.bin:/root/node_modules/.bin
RUN apk add --update --no-cache bash curl g++ gcc git jq make python3
# npm 7.x.x doesn't seem to respect the --production flag so should we stick with 6.x.x?
RUN npm config set unsafe-perm true && npm install -g [email protected]
RUN npm install [email protected] --no-save --no-package-lock
RUN npm install [email protected] --no-save --no-package-lock
RUN npm config set unsafe-perm true && npm install -g [email protected]
RUN curl https://raw.githubusercontent.com/vishnubob/wait-for-it/ed77b63706ea721766a62ff22d3a251d8b4a6a30/wait-for-it.sh > /bin/wait-for && chmod +x /bin/wait-for

COPY package.json .package.json
RUN sed '/@bloggit/d' .package.json > package.json
RUN npm install

COPY ops ops
COPY src src
COPY dist dist

ENTRYPOINT ["bash", "ops/entry.sh"]
5 changes: 1 addition & 4 deletions modules/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"main": "dist/bundle.js",
"scripts": {
"build": "rollup --config rollup.config.js",
"test": "ts-mocha --check-leaks --exit --timeout 60000 'src/**/*.test.ts'"
"test": "echo 'no tests'"
},
"dependencies": {
"body-parser": "1.19.0",
Expand All @@ -29,13 +29,10 @@
"@rollup/plugin-typescript": "8.3.4",
"@types/chai": "4.2.22",
"@types/express": "4.17.13",
"@types/mocha": "9.0.0",
"@types/node": "^16.11.45",
"chai": "4.3.4",
"chai-as-promised": "7.1.1",
"mocha": "9.1.1",
"rollup": "2.77.2",
"ts-mocha": "8.0.0",
"ts-node": "10.3.0",
"tslib": "2.3.1",
"typescript": "4.3.5"
Expand Down
Loading

0 comments on commit cff7cb1

Please sign in to comment.