From 2691734865553da70b8e4100eaf76fdeff155787 Mon Sep 17 00:00:00 2001
From: Sam Penrose <spenrose@mozilla.com>
Date: Mon, 8 Sep 2014 16:32:10 -0700
Subject: [PATCH] Bug 1064606 - Update FxAccountsManager tests with Principal.
 r=ferjm CLOSED TREE

---
 .../fxaccounts/tests/xpcshell/test_manager.js | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/services/fxaccounts/tests/xpcshell/test_manager.js b/services/fxaccounts/tests/xpcshell/test_manager.js
index b22af36c8038..eaf40a3542d1 100644
--- a/services/fxaccounts/tests/xpcshell/test_manager.js
+++ b/services/fxaccounts/tests/xpcshell/test_manager.js
@@ -16,6 +16,9 @@ Cu.import("resource://gre/modules/Promise.jsm");
 let passwordResetOnServer = false;
 let deletedOnServer = false;
 
+// Mock RP
+let principal = {origin: 'app://settings.gaiamobile.org', appId: 27}
+
 // Override FxAccountsUIGlue.
 const kFxAccountsUIGlueUUID = "{8f6d5d87-41ed-4bb5-aa28-625de57564c5}";
 const kFxAccountsUIGlueContractID =
@@ -304,7 +307,7 @@ add_test(function(test_getAssertion_no_audience) {
 add_test(function(test_getAssertion_no_session_ui_error) {
   do_print("= getAssertion no session, UI error =");
   FxAccountsUIGlue._reject = true;
-  FxAccountsManager.getAssertion("audience").then(
+  FxAccountsManager.getAssertion("audience", principal).then(
     () => {
       do_throw("Unexpected success");
     },
@@ -319,7 +322,7 @@ add_test(function(test_getAssertion_no_session_ui_error) {
 
 add_test(function(test_getAssertion_no_session_ui_success) {
   do_print("= getAssertion no session, UI success =");
-  FxAccountsManager.getAssertion("audience").then(
+  FxAccountsManager.getAssertion("audience", principal).then(
     () => {
       do_throw("Unexpected success");
     },
@@ -334,7 +337,7 @@ add_test(function(test_getAssertion_no_session_ui_success) {
 
 add_test(function(test_getAssertion_active_session_unverified_account) {
   do_print("= getAssertion active session, unverified account =");
-  FxAccountsManager.getAssertion("audience").then(
+  FxAccountsManager.getAssertion("audience", principal).then(
     result => {
       do_throw("Unexpected success");
     },
@@ -350,7 +353,7 @@ add_test(function(test_getAssertion_active_session_verified_account) {
   do_print("= getAssertion active session, verified account =");
   FxAccountsManager._fxAccounts._signedInUser.verified = true;
   FxAccountsManager._activeSession.verified = true;
-  FxAccountsManager.getAssertion("audience").then(
+  FxAccountsManager.getAssertion("audience", principal).then(
     result => {
       do_check_false(FxAccountsUIGlue._signInFlowCalled);
       do_check_eq(result, "assertion");
@@ -375,7 +378,7 @@ add_test(function(test_getAssertion_refreshAuth) {
   FxAccountsManager._activeSession.verified = true;
   FxAccountsManager._activeSession.authAt =
     (Date.now() / 1000) - gracePeriod;
-  FxAccountsManager.getAssertion("audience", {
+  FxAccountsManager.getAssertion("audience", principal, {
     "refreshAuthentication": gracePeriod
   }).then(
     result => {
@@ -396,7 +399,7 @@ add_test(function(test_getAssertion_server_state_change) {
   FxAccountsManager._fxAccounts._signedInUser.verified = true;
   FxAccountsManager._activeSession.verified = true;
   passwordResetOnServer = true;
-  FxAccountsManager.getAssertion("audience").then(
+  FxAccountsManager.getAssertion("audience", principal).then(
     (result) => {
       // For password reset, the UIGlue mock simulates sucessful
       // refreshAuth which supplies new password, not signin/signup.
@@ -408,7 +411,7 @@ add_test(function(test_getAssertion_server_state_change) {
   ).then(
     () => {
       deletedOnServer = true;
-      FxAccountsManager.getAssertion("audience").then(
+      FxAccountsManager.getAssertion("audience", principal).then(
         (result) => {
           // For account deletion, the UIGlue's signin/signup is called.
           do_check_true(FxAccountsUIGlue._signInFlowCalled)
@@ -427,7 +430,7 @@ add_test(function(test_getAssertion_server_state_change) {
 add_test(function(test_getAssertion_refreshAuth_NaN) {
   do_print("= getAssertion refreshAuth NaN=");
   let gracePeriod = "NaN";
-  FxAccountsManager.getAssertion("audience", {
+  FxAccountsManager.getAssertion("audience", principal, {
     "refreshAuthentication": gracePeriod
   }).then(
     result => {
@@ -449,7 +452,7 @@ add_test(function(test_getAssertion_refresh_auth_no_refresh) {
   FxAccountsManager._activeSession.verified = true;
   FxAccountsManager._activeSession.authAt =
     (Date.now() / 1000) + 10000;
-  FxAccountsManager.getAssertion("audience", {
+  FxAccountsManager.getAssertion("audience", principal, {
     "refreshAuthentication": 1
   }).then(
     result => {