fix some tests

winter0019 · Nov 24, 2020 · 291d468 · 291d468
1 parent 51ea762
commit 291d468
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 438 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -180,7 +180,12 @@ module.exports = grunt => {
         tasks: ['sass'],
       },
       transpile: {
-        files: ['./ts/**/*.ts', './ts/**/*.tsx', './ts/**/**/*.tsx'],
+        files: [
+          './ts/**/*.ts',
+          './ts/**/*.tsx',
+          './ts/**/**/*.tsx',
+          './test/ts/**.ts',
+        ],
         tasks: ['exec:transpile'],
       },
     },

diff --git a/js/ConversationController.d.ts b/js/ConversationController.d.ts
@@ -7,4 +7,5 @@ export type ConversationControllerType = {
   getOrThrow: (id: string) => ConversationModel;
   getOrCreateAndWait: (id: string, type: string) => Promise<ConversationModel>;
   getOrCreate: (id: string, type: string) => Promise<ConversationModel>;
+  dangerouslyCreateAndAdd: (any) => any;
 };
diff --git a/password.html b/password.html
@@ -26,8 +26,8 @@
 <body>
   <div class='app-loading-screen'>
     <div class="content session-full-logo">
-            <img src="images/session/brand.svg" class="session-brand-logo" />
-            <img src="images/session/session-text.svg" class="session-text-logo" />
+        <img src="images/session/brand.svg" class="session-brand-logo" />
+        <img src="images/session/session-text.svg" class="session-text-logo" />
     </div>
   </div>
   <script type='text/javascript' src='js/password_start.js'></script>

diff --git a/test/backup_test.js b/test/backup_test.js
@@ -487,8 +487,10 @@ describe('Backup', () => {
 
         console.log('Backup test: Create models, save to db/disk');
         const message = await upgradeMessageSchema(messageWithAttachments);
-        console.log({ message });
-        await message.commit();
+        await window.Signal.Data.saveMessage(message, {
+          Message: Whisper.Message,
+          forceSave: true,
+        });
 
         const conversation = {
           active_at: 1524185933350,

diff --git a/test/fixtures.js b/test/fixtures.js
@@ -1,11 +1,11 @@
 /* global Whisper */
 
 Whisper.Fixtures = () => {
-  const VERA_ID = '+13016886524'; // nsa
-  const NESTOR_ID = '+17034820623'; // cia
-  const MASHA_ID = '+441242221491'; // gchq
-  const FRED_ID = '+14155537400'; // fbi sf
-  const MICHEL_ID = '+12024561111'; // twh
+  const VERA_ID = '0501cd123456789abcdef05123456789abcdef05123456789abcdef05123456789'; // nsa
+  const NESTOR_ID = '0502cd123456789abcdef05123456789abcdef05123456789abcdef05123456789'; // cia
+  const MASHA_ID = '0503cd123456789abcdef05123456789abcdef05123456789abcdef05123456789'; // gchq
+  const FRED_ID = '0504cd123456789abcdef05123456789abcdef05123456789abcdef05123456789'; // fbi sf
+  const MICHEL_ID = '0505cd123456789abcdef05123456789abcdef05123456789abcdef05123456789'; // twh
 
   const now = Date.now();
   const conversationCollection = new Whisper.ConversationCollection([
@@ -172,7 +172,7 @@ Whisper.Fixtures = () => {
     type: 'group',
     active_at: now - 100000,
     timestamp: now - 100000,
-    id: 'group1',
+    id: '05abcd123456789abcdef05123456789abcdef05123456789abcdef05123456789',
     lastMessage: 'See you all there!',
     members: [MICHEL_ID, FRED_ID, NESTOR_ID],
   });

diff --git a/test/fixtures_test.js b/test/fixtures_test.js
@@ -9,7 +9,7 @@ describe('Fixtures', () => {
 
     await clearDatabase();
     await textsecure.storage.user.setNumberAndDeviceId(
-      '+17015552000',
+      '05123456789abcdef05123456789abcdef05123456789abcdef05123456789abcd',
       2,
       'testDevice'
     );
@@ -27,12 +27,10 @@ describe('Fixtures', () => {
     await ConversationController.load();
 
     let view = new Whisper.InboxView({ window });
-    view.onEmpty();
     view.$el.prependTo($('#render-light-theme'));
 
     view = new Whisper.InboxView({ window });
     view.$el.removeClass('light-theme').addClass('dark-theme');
-    view.onEmpty();
     view.$el.prependTo($('#render-dark-theme'));
   });
 });
diff --git a/test/index.html b/test/index.html
@@ -19,8 +19,8 @@
 
   <script type="text/x-tmpl-mustache" id="app-loading-screen">
     <div class="content session-full-logo">
-      <img src="images/session/brand.svg" class="session-brand-logo" />
-      <img src="images/session/session-text.svg" class="session-text-logo" />
+      <img src="../images/session/brand.svg" class="session-brand-logo" />
+      <img src="../images/session/session-text.svg" class="session-text-logo" />
     </div>
   </script>
 

diff --git a/test/keychange_listener_test.js b/test/keychange_listener_test.js