Skip to content

Commit

Permalink
Replaced custom MongoDB test container with the one provided by TestC…
Browse files Browse the repository at this point in the history
…ontainers
  • Loading branch information
oskardudycz committed Jan 4, 2024
1 parent 7fa829e commit e36356c
Show file tree
Hide file tree
Showing 24 changed files with 114 additions and 372 deletions.
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Github Sponsors](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&link=https://github.com/sponsors/oskardudycz/)](https://github.com/sponsors/oskardudycz/) [![blog](https://img.shields.io/badge/blog-event--driven.io-brightgreen)](https://event-driven.io/?utm_source=event_sourcing_nodejs) [![blog](https://img.shields.io/badge/%F0%9F%9A%80-Architecture%20Weekly-important)](https://www.architecture-weekly.com/?utm_source=event_sourcing_nodejs) [![LinkedIn](https://img.shields.io/badge/LinkedIn-0077B5?style=for-the-badge&logo=linkedin&logoColor=white)](https://www.linkedin.com/in/oskardudycz/)
[<img src="https://img.shields.io/badge/LinkedIn-0077B5?style=for-the-badge&logo=linkedin&logoColor=white" height="20px" />](https://www.linkedin.com/in/oskardudycz/) [![Subscribe](https://img.shields.io/badge/%F0%9F%9A%80-subscribe!-important)](https://www.architecture-weekly.com/?utm_source=github_architecture_weekly) [![Github Sponsors](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&link=https://github.com/sponsors/oskardudycz/)](https://github.com/sponsors/oskardudycz/) [![blog](https://img.shields.io/badge/blog-event--driven.io-brightgreen)](https://event-driven.io/?utm_source=architecture_weekly)

# EventSourcing.NodeJS

Expand Down Expand Up @@ -1040,11 +1040,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/setup-node@v1
- uses: actions/checkout@v4
- name: Use Node.js 20.10.x
uses: actions/setup-node@v4
with:
node-version: 14.x
node-version: 20.10.x
# install dependencies based on the package log
- run: npm ci
# run linting (ESlint and Prettier)
Expand Down Expand Up @@ -1083,12 +1083,12 @@ jobs:
# selected operation systems to run Continuous Integration
os: [windows-latest, ubuntu-latest, macos-latest]
# selected node version to run Continuous Integration
node-version: [14.x, 15.x]
node-version: [18.x, 20.10.x]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
# use the node version defined in matrix above
node-version: ${{ matrix.node-version }}
Expand Down Expand Up @@ -1315,12 +1315,12 @@ jobs:
# selected operation systems to run CI
os: [windows-latest, ubuntu-latest, macos-latest]
# selected node version to run CI
node-version: [14.x, 15.x]
node-version: [18.x, 20.10.x]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
# use the node version defined in matrix above
node-version: ${{ matrix.node-version }}
Expand All @@ -1340,7 +1340,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
# setup Docker buld action
- name: Set up Docker Buildx
Expand Down
19 changes: 19 additions & 0 deletions samples/closingTheBooks/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions samples/closingTheBooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"validator": "13.11.0"
},
"devDependencies": {
"@testcontainers/mongodb": "10.4.0",
"@types/convict": "6.1.6",
"@types/dotenv": "8.2.0",
"@types/express": "4.17.21",
Expand Down
4 changes: 2 additions & 2 deletions samples/closingTheBooks/src/e2e/fullFlow.e2e.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
import {
MongoDBContainer,
StartedMongoDBContainer,
} from '#testing/mongoDB/mongoDBContainer';
} from '@testcontainers/mongodb';
import { retry } from '#testing/retries';
import app from '../app';
import { getSubscription } from '../getSubscription';
Expand All @@ -25,7 +25,7 @@ describe('Full flow', () => {
esdbContainer = await new EventStoreDBContainer().start();
config.eventStoreDB.connectionString = esdbContainer.getConnectionString();

mongodbContainer = await new MongoDBContainer().start();
mongodbContainer = await new MongoDBContainer('mongo:6.0.12').start();
config.mongoDB.connectionString = mongodbContainer.getConnectionString();
console.log(config.mongoDB.connectionString);

Expand Down

This file was deleted.

53 changes: 0 additions & 53 deletions samples/closingTheBooks/src/testing/mongoDB/mongoDBContainer.ts

This file was deleted.

19 changes: 19 additions & 0 deletions samples/decider/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions samples/decider/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"mongodb": "6.3.0"
},
"devDependencies": {
"@testcontainers/mongodb": "10.4.0",
"@types/convict": "6.1.6",
"@types/express": "4.17.21",
"@types/jest": "29.5.11",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { MongoDBContainer, Spec } from '#testing/mongoDB';
import { MongoDBContainer } from '@testcontainers/mongodb';
import { mongoObjectId } from '#core/mongoDB';
import {
ClientShoppingHistory,
Expand All @@ -8,15 +8,16 @@ import {
import { MongoClient } from 'mongodb';
import { ShoppingCartEvent } from '../shoppingCart';
import { PricedProductItem } from '../productItem';
import { Spec } from '#testing/mongoDB/mongoDbProjectionTests';

describe('Client Shopping History', () => {
let mongo: MongoClient;
let given: Spec<ShoppingCartEvent, ClientShoppingHistory>;

beforeAll(async () => {
const mongoContainer = await new MongoDBContainer().start();
const mongoContainer = await new MongoDBContainer('mongo:6.0.12').start();
console.log(mongoContainer.getConnectionString());
mongo = mongoContainer.getClient();
mongo = new MongoClient(mongoContainer.getConnectionString());
await mongo.connect();

given = Spec.for(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { MongoDBContainer, Spec } from '#testing/mongoDB';
import { MongoDBContainer } from '@testcontainers/mongodb';
import { MongoClient } from 'mongodb';
import { mongoObjectId } from '#core/mongoDB';
import {
Expand All @@ -9,15 +9,16 @@ import {
} from './shoppingCartDetails';
import { ShoppingCartEvent } from '../shoppingCart';
import { PricedProductItem } from 'src/gist';
import { Spec } from '#testing/mongoDB/mongoDbProjectionTests';

describe('Shopping Cart details', () => {
let mongo: MongoClient;
let given: Spec<ShoppingCartEvent, ShoppingCartDetails>;

beforeAll(async () => {
const mongoContainer = await new MongoDBContainer().start();
const mongoContainer = await new MongoDBContainer('mongo:6.0.12').start();
console.log(mongoContainer.getConnectionString());
mongo = mongoContainer.getClient();
mongo = new MongoClient(mongoContainer.getConnectionString());
await mongo.connect();

given = Spec.for(
Expand Down
2 changes: 0 additions & 2 deletions samples/decider/src/testing/mongoDB/index.ts

This file was deleted.

32 changes: 0 additions & 32 deletions samples/decider/src/testing/mongoDB/mongoDBContainer.int.test.ts

This file was deleted.

Loading

0 comments on commit e36356c

Please sign in to comment.