Merge branch 'develop' into refactor/parallelize-e2e-tests

RocketChat · Aug 2, 2022 · fc857b8 · fc857b8
2 parents fc1f94e + 0343424
commit fc857b8
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 8 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -341,7 +341,17 @@ jobs:
           done;
           exit $s
 
+      - name: Cache Playwright binaries
+        uses: actions/cache@v3
+        id: cache-playwright
+        with:
+          path: |
+            ~/.cache/ms-playwright
+          # This is the version of Playwright that we are using, if you are willing to upgrade, you should update this.
+          key: playwright-1.23.1
+
       - name: Install Playwright
+        if: steps.cache-playwright.outputs.cache-hit != 'true'
         run: |
           cd ./apps/meteor
           npx playwright install --with-deps
@@ -636,6 +646,15 @@ jobs:
           done;
           exit $s
 
+      - name: Cache Playwright binaries
+        uses: actions/cache@v3
+        id: cache-playwright
+        with:
+          path: |
+            ~/.cache/ms-playwright
+          # This is the version of Playwright that we are using, if you are willing to upgrade, you should update this.
+          key: playwright-1.23.1
+
       - name: Install Playwright
         run: |
           cd ./apps/meteor

diff --git a/apps/meteor/app/api/server/v1/im.ts b/apps/meteor/app/api/server/v1/im.ts
@@ -434,7 +434,7 @@ API.v1.addRoute(
 				.toArray();
 
 			const { cursor, totalCount } = Rooms.findPaginated(
-				{ type: 'd', _id: { $in: subscriptions } },
+				{ t: 'd', _id: { $in: subscriptions } },
 				{
 					sort,
 					skip: offset,
@@ -451,7 +451,7 @@ API.v1.addRoute(
 			return API.v1.success({
 				ims,
 				offset,
-				count,
+				count: ims.length,
 				total,
 			});
 		},

diff --git a/apps/meteor/playwright.config.ts b/apps/meteor/playwright.config.ts
@@ -5,7 +5,7 @@ import * as constants from './tests/e2e/config/constants';
 export default {
 	globalSetup: require.resolve('./tests/e2e/config/global-setup.ts'),
 	use: {
-		headless: false,
+		headless: true,
 		ignoreHTTPSErrors: true,
 		trace: 'retain-on-failure',
 		baseURL: constants.BASE_URL,
@@ -14,7 +14,7 @@ export default {
 	outputDir: 'tests/e2e/.playwright',
 	reporter: process.env.CI ? 'github' : 'list',
 	testDir: 'tests/e2e',
-	workers: 2,
+	workers: process.env.CI ? 1 : undefined,
 	timeout: process.env.CI ? 2000_000 : 600_000,
 	retries: process.env.CI ? 2 : undefined,
 	globalTimeout: 2000_000,

diff --git a/apps/meteor/tests/end-to-end/api/04-direct-message.js b/apps/meteor/tests/end-to-end/api/04-direct-message.js
@@ -188,8 +188,18 @@ describe('[Direct Messages]', function () {
 			.expect(200)
 			.expect((res) => {
 				expect(res.body).to.have.property('success', true);
-				expect(res.body).to.have.property('count');
-				expect(res.body).to.have.property('total');
+				expect(res.body).to.have.property('count', 1);
+				expect(res.body).to.have.property('total', 1);
+				expect(res.body).to.have.property('ims').and.to.be.an('array');
+				const im = res.body.ims[0];
+				expect(im).to.have.property('_id');
+				expect(im).to.have.property('t').and.to.be.eq('d');
+				expect(im).to.have.property('msgs').and.to.be.a('number');
+				expect(im).to.have.property('usernames').and.to.be.an('array');
+				expect(im).to.have.property('lm');
+				expect(im).to.have.property('_updatedAt');
+				expect(im).to.have.property('ts');
+				expect(im).to.have.property('lastMessage');
 			})
 			.end(done);
 	});
@@ -202,8 +212,19 @@ describe('[Direct Messages]', function () {
 			.expect(200)
 			.expect((res) => {
 				expect(res.body).to.have.property('success', true);
-				expect(res.body).to.have.property('count');
-				expect(res.body).to.have.property('total');
+				expect(res.body).to.have.property('count', 1);
+				expect(res.body).to.have.property('total', 1);
+				expect(res.body).to.have.property('ims').and.to.be.an('array');
+				const im = res.body.ims[0];
+				expect(im).to.have.property('_id');
+				expect(im).to.have.property('t').and.to.be.eq('d');
+				expect(im).to.have.property('msgs').and.to.be.a('number');
+				expect(im).to.have.property('usernames').and.to.be.an('array');
+				expect(im).to.have.property('ro');
+				expect(im).to.have.property('sysMes');
+				expect(im).to.have.property('_updatedAt');
+				expect(im).to.have.property('ts');
+				expect(im).to.have.property('lastMessage');
 			})
 			.end(done);
 	});