Merge pull request #795 from decentraland/feat/add-worlds-multi-scene-support

feat: Add worlds multi scene support

Author: LautaroPetaccio

.github/workflows/pull-request.yml

@@ -56,3 +56,71 @@ jobs:
           tags: ${{ github.sha }}
           dockerfiles: |
             ./Dockerfile
+
+  integration-tests:
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres:15
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: places_test
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd "pg_isready -U postgres"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+      localstack:
+        image: localstack/localstack:latest
+        env:
+          SERVICES: sqs
+          DEFAULT_REGION: us-east-1
+        ports:
+          - 4566:4566
+
+    env:
+      CONNECTION_STRING: postgres://postgres:postgres@localhost:5432/places_test
+      AWS_REGION: us-east-1
+      AWS_ENDPOINT: http://localhost:4566
+      QUEUE_URL: http://localhost:4566/000000000000/places_test
+      AWS_ACCESS_KEY_ID: test
+      AWS_SECRET_ACCESS_KEY: test
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Reconfigure git to use HTTP authentication
+        run: >
+          git config --global url."https://github.com/".insteadOf "ssh://git@github.com/"
+
+      - name: node.js 18
+        uses: actions/setup-node@v4.0.1
+        with:
+          node-version: 18.x
+          registry-url: https://registry.npmjs.org/
+          cache: "npm"
+
+      - name: installing
+        run: npm install
+
+      - name: Create SQS queue in LocalStack
+        run: |
+          pip install awscli-local awscli
+          awslocal sqs create-queue --queue-name places_test
+
+      - name: Run database migrations
+        run: >
+          ./node_modules/.bin/node-pg-migrate
+          --tsconfig ./tsconfig.json
+          -j ts
+          -m ./src/migrations
+          -d CONNECTION_STRING
+          up
+
+      - name: Run integration tests
+        run: npm run test:integration

.gitignore

@@ -81,3 +81,5 @@ static/light-theme.css
 static/semantic.min.css
 static/sw.js
 static/sw.js.map
+
+.cursor

jest.config.js

@@ -5,6 +5,7 @@ module.exports = {
   fakeTimers: {
     enableGlobally: true,
   },
+  testPathIgnorePatterns: ["/node_modules/", "<rootDir>/test/"],
   moduleNameMapper: {
     "^decentraland-dapps/dist/modules/analytics/utils$":
       "<rootDir>/__mocks__/decentraland-dapps-analytics.js",

jest.integration.config.js

@@ -0,0 +1,20 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const baseConfig = require("./jest.config")
+
+module.exports = {
+  ...baseConfig,
+  fakeTimers: {
+    enableGlobally: false,
+  },
+  testMatch: ["<rootDir>/test/**/*.test.ts"],
+  testPathIgnorePatterns: ["/node_modules/"],
+  testTimeout: 30000,
+  transform: {
+    "^.+\\.tsx?$": [
+      "ts-jest",
+      {
+        tsconfig: "tsconfig.test.json",
+      },
+    ],
+  },
+}

package-lock.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@contentful/rich-text-react-renderer": "^16.1.6",
     "@dcl/hooks": "^1.0.0",
-    "@dcl/schemas": "^22.2.0",
+    "@dcl/schemas": "^22.4.0",
     "@sentry/browser": "^7.120.3",
     "@well-known-components/pushable-channel": "^1.0.3",
     "abort-controller": "^3.0.0",
@@ -66,6 +66,7 @@
     "@types/node": "^18.19.64",
     "@types/react": "^18.0.0",
     "@types/react-helmet": "^5.0.15",
+    "@types/supertest": "^6.0.3",
     "@types/validator": "^13.7.5",
     "@types/web-push": "^3.3.2",
     "@types/xml": "^1.0.5",
@@ -91,14 +92,15 @@
     "lint-staged": "12.3.8",
     "nodemon": "^2.0.15",
     "prettier": "^2.6.2",
+    "supertest": "^7.2.2",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.8.0",
     "tsc-files": "^1.1.3",
     "typescript": "^5.9.3",
     "workbox-cli": "^6.5.2"
   },
   "overrides": {
-    "@dcl/schemas": "^22.2.0"
+    "@dcl/schemas": "^22.4.0"
   },
   "keywords": [
     "gatsby"
@@ -121,6 +123,7 @@
     "clean": "gatsby clean",
     "migrate": "./node_modules/.bin/node-pg-migrate --envPath ./.env.development --tsconfig ./tsconfig.json -j ts -m ./src/migrations -d CONNECTION_STRING",
     "test": "jest",
+    "test:integration": "jest --config jest.integration.config.js --runInBand",
     "husky-setup": "husky install",
     "precommit": "lint-staged --config .husky/pre-commit.js",
     "lint": "eslint --ext .ts,.tsx,.js,.jsx ./src",