From 4df35bdcd9e57452bb7f5f5b73f9e52f3693a78f Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Mon, 14 Nov 2016 01:29:08 +0100
Subject: add test for base url canonicalization and fix canonicalization bug

---
 testlib/selenium/testhost.html |  2 ++
 testlib/talertest.ts           | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'testlib')

diff --git a/testlib/selenium/testhost.html b/testlib/selenium/testhost.html
index fcc9394f2..01641547d 100644
--- a/testlib/selenium/testhost.html
+++ b/testlib/selenium/testhost.html
@@ -7,6 +7,8 @@
     <script src="/testlib/selenium/escodegen.browser.js"></script>
     <script src="/testlib/selenium/instrumenter.js"></script>
 
+    <script src="/src/vendor/URI.js"></script>
+
     <!-- for instrumentation to work, we have to use the non-csp version -->
     <script src="/testlib/selenium/system.js"></script>
 
diff --git a/testlib/talertest.ts b/testlib/talertest.ts
index 6012eb657..b602fca14 100644
--- a/testlib/talertest.ts
+++ b/testlib/talertest.ts
@@ -30,6 +30,7 @@ export interface TestLib {
   pass(msg?: string): void;
   fail(msg?: string): void;
   assert(v: any, msg?: string): void;
+  assertEqualsStrict(v1: any, v2: any, msg?: string): void;
 }
 
 let tests: Test[] = [];
@@ -75,8 +76,17 @@ export async function run(statusCallback?: (m: string) => void) {
           throw Error("test failed");
         }
       };
+      let assertEqualsStrict = (v1: any, v2: any, msg?: string) => {
+        if (v1 !== v2) {
+          console.log(`# expected: ${v1}`);
+          console.log(`# actual: ${v2}`);
+          lastMsg = msg;
+          reject();
+          throw Error("test failed");
+        }
+      };
       // Test might return a promise.  If so, wait for it.
-      let r = t.testFn({pass,fail, assert});
+      let r = t.testFn({pass,fail, assert, assertEqualsStrict});
       r.then(() => resolve(), (e) => reject(e));
     });
 
-- 
cgit v1.2.3