From 878619a0bcdb4b922865903293e7132e24c34dd3 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 3 Aug 2020 15:58:52 +1000 Subject: [PATCH] move integration tests to _itest.ts suffix --- package.json | 4 ++-- ..._contacts_test.ts => add_contacts_itest.ts} | 0 ...sed_group_test.ts => closed_group_itest.ts} | 0 ...ntegration_test.ts => integration_itest.ts} | 18 +++++++++--------- ...ink_device_test.ts => link_device_itest.ts} | 0 ...ions_test.ts => message_functions_itest.ts} | 0 ...sage_sync_test.ts => message_sync_itest.ts} | 0 ...{open_group_test.ts => open_group_itest.ts} | 0 ...istration_test.ts => registration_itest.ts} | 0 ...ender_keys_test.ts => sender_keys_itest.ts} | 0 .../{settings_test.ts => settings_itest.ts} | 0 11 files changed, 11 insertions(+), 11 deletions(-) rename ts/test/session/integration/{add_contacts_test.ts => add_contacts_itest.ts} (100%) rename ts/test/session/integration/{closed_group_test.ts => closed_group_itest.ts} (100%) rename ts/test/session/integration/{integration_test.ts => integration_itest.ts} (63%) rename ts/test/session/integration/{link_device_test.ts => link_device_itest.ts} (100%) rename ts/test/session/integration/{message_functions_test.ts => message_functions_itest.ts} (100%) rename ts/test/session/integration/{message_sync_test.ts => message_sync_itest.ts} (100%) rename ts/test/session/integration/{open_group_test.ts => open_group_itest.ts} (100%) rename ts/test/session/integration/{registration_test.ts => registration_itest.ts} (100%) rename ts/test/session/integration/{sender_keys_test.ts => sender_keys_itest.ts} (100%) rename ts/test/session/integration/{settings_test.ts => settings_itest.ts} (100%) diff --git a/package.json b/package.json index 16c9f6ad4..95aa400ff 100644 --- a/package.json +++ b/package.json @@ -31,8 +31,8 @@ "test-lib-view": "NODE_ENV=test-lib yarn run start", "test-loki-view": "NODE_ENV=test-loki yarn run start", "test-electron": "yarn grunt test", - "test-integration": "ELECTRON_DISABLE_SANDBOX=1 mocha --exit --full-trace --timeout 10000 ts/test/session/integration/integration_test.js", - "test-node": "mocha --recursive --exit test/app test/modules ts/test libloki/test/node --timeout 10000", + "test-integration": "ELECTRON_DISABLE_SANDBOX=1 mocha --exit --full-trace --timeout 10000 ts/test/session/integration/integration_itest.js", + "test-node": "mocha --recursive --exit --timeout 10000 test/app test/modules \"./ts/test/**/*_test.js\" libloki/test/node ", "test-session": "mocha --recursive --exit ts/test/session/unit --full-trace --timeout 10000", "test-medium-groups": "ELECTRON_DISABLE_SANDBOX=1 mocha --exit --timeout 10000 integration_test/integration_test.js --grep 'senderkeys'", "test-groups": "ELECTRON_DISABLE_SANDBOX=1 mocha --exit --timeout 10000 integration_test/integration_test.js --grep 'Closed groups'", diff --git a/ts/test/session/integration/add_contacts_test.ts b/ts/test/session/integration/add_contacts_itest.ts similarity index 100% rename from ts/test/session/integration/add_contacts_test.ts rename to ts/test/session/integration/add_contacts_itest.ts diff --git a/ts/test/session/integration/closed_group_test.ts b/ts/test/session/integration/closed_group_itest.ts similarity index 100% rename from ts/test/session/integration/closed_group_test.ts rename to ts/test/session/integration/closed_group_itest.ts diff --git a/ts/test/session/integration/integration_test.ts b/ts/test/session/integration/integration_itest.ts similarity index 63% rename from ts/test/session/integration/integration_test.ts rename to ts/test/session/integration/integration_itest.ts index cde34e6f3..aa37c6577 100644 --- a/ts/test/session/integration/integration_test.ts +++ b/ts/test/session/integration/integration_itest.ts @@ -2,15 +2,15 @@ import { Common } from './common'; // tslint:disable: no-import-side-effect no-invalid-this await-promise -import './registration_test'; -import './open_group_test'; -import './add_contacts_test'; -import './link_device_test'; -// import './closed_group_test'; -// import './message_functions_test'; -// import './settings_test'; -// import'./message_sync_test'; -// import './sender_keys_test'; +import './registration_itest'; +import './open_group_itest'; +import './add_contacts_itest'; +import './link_device_itest'; +// import './closed_group_itest'; +// import './message_functions_itest'; +// import './settings_itest'; +// import'./message_sync_itest'; +// import './sender_keys_itest'; before(async function() { // start the app once before all tests to get the platform-dependent diff --git a/ts/test/session/integration/link_device_test.ts b/ts/test/session/integration/link_device_itest.ts similarity index 100% rename from ts/test/session/integration/link_device_test.ts rename to ts/test/session/integration/link_device_itest.ts diff --git a/ts/test/session/integration/message_functions_test.ts b/ts/test/session/integration/message_functions_itest.ts similarity index 100% rename from ts/test/session/integration/message_functions_test.ts rename to ts/test/session/integration/message_functions_itest.ts diff --git a/ts/test/session/integration/message_sync_test.ts b/ts/test/session/integration/message_sync_itest.ts similarity index 100% rename from ts/test/session/integration/message_sync_test.ts rename to ts/test/session/integration/message_sync_itest.ts diff --git a/ts/test/session/integration/open_group_test.ts b/ts/test/session/integration/open_group_itest.ts similarity index 100% rename from ts/test/session/integration/open_group_test.ts rename to ts/test/session/integration/open_group_itest.ts diff --git a/ts/test/session/integration/registration_test.ts b/ts/test/session/integration/registration_itest.ts similarity index 100% rename from ts/test/session/integration/registration_test.ts rename to ts/test/session/integration/registration_itest.ts diff --git a/ts/test/session/integration/sender_keys_test.ts b/ts/test/session/integration/sender_keys_itest.ts similarity index 100% rename from ts/test/session/integration/sender_keys_test.ts rename to ts/test/session/integration/sender_keys_itest.ts diff --git a/ts/test/session/integration/settings_test.ts b/ts/test/session/integration/settings_itest.ts similarity index 100% rename from ts/test/session/integration/settings_test.ts rename to ts/test/session/integration/settings_itest.ts