From 096717c1877cbe39bef07315a7e13511dfb3dacc Mon Sep 17 00:00:00 2001
From: Sergey Yanovich <ynvich@gmail.com>
Date: Tue, 4 Mar 2008 00:10:48 +0200
Subject: [PATCH] [view] restore update of from flow on transfer page (bug
 #138)

---
 app/chrome/content/transfer.js |  1 +
 app/test/aaTestAccountViews.js | 50 +++++++++++++++++++++++++++++++-----------
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/app/chrome/content/transfer.js b/app/chrome/content/transfer.js
index b85b6a2..f579cc2 100644
--- a/app/chrome/content/transfer.js
+++ b/app/chrome/content/transfer.js
@@ -128,6 +128,7 @@ function transferReset()
   document.getElementById("canReset").setAttribute("disabled","true");
   document.getElementById("canReset").setAttribute("collapsed","true");
   updateAll();
+  gFact.broadcasting = true;
 }
 
 function chosenFrom()
diff --git a/app/test/aaTestAccountViews.js b/app/test/aaTestAccountViews.js
index 096665e..d5bb309 100644
--- a/app/test/aaTestAccountViews.js
+++ b/app/test/aaTestAccountViews.js
@@ -118,33 +118,38 @@ function ModuleInit()
   this._tests[18].instance.item = 0;
   /* 19 */
   this._add(transfer_save_CID, transfer_save_contractID,
-      transfer_save_name, transfer_save_test);
+      transfer_save_name, transfer_save_test, flow_select_check);
   /* 20 */
+  this._add(submit_after_reset_CID, submit_after_reset_contractID,
+      submit_after_reset_name,  flow_submit_test,
+      submit_after_reset_check);
+  this._tests[20].instance.item = 1;
+  /* 21 */
   this._add(account_page_CID, account_page_contractID, account_page_name,
       account_page_test, account_page_check);
-  /* 21 */
+  /* 22 */
   this._add(transcript_page_CID, transcript_page_contractID,
       transcript_page_name, transcript_page_test, transcript_page_check);
-  /* 22 */
+  /* 23 */
   this._add(transcript_flow_CID, transcript_flow_contractID, transcript_flow_name,
       transcript_flow_test, flow_select_check);
-  /* 23 */
+  /* 24 */
   this._add(tf_discard_CID, tf_discard_contractID, tf_discard_name,
       flow_discard_test, transcript_flow_discard_check);
-  this._tests[23].instance.item = 0;
-  /* 24 */
-  this._repeat(22);
+  this._tests[24].instance.item = 0;
   /* 25 */
+  this._repeat(23);
+  /* 26 */
   this._add(tf_submit_CID, tf_submit_contractID, tf_submit_name,
       flow_submit_test, transcript_flow_submit_check);
-  this._tests[25].instance.item = 1;
-  /* 26 */
+  this._tests[26].instance.item = 1;
+  /* 27 */
   this._add(transcript_load_CID, transcript_load_contractID,
       transcript_load_name, transcript_load_test);
-  /* 27 */
+  /* 28 */
   this._add(transcript_after_flow_CID, transcript_after_flow_contractID,
       transcript_after_flow_name, transcript_after_flow_test);
-  /* 28 */
+  /* 29 */
   this._add(transcript_income_flow_CID, transcript_income_flow_contractID,
       transcript_income_flow_name, transcript_income_flow_test);
 }
@@ -793,7 +798,6 @@ function transfer_to_submit_test(runner)
   runner.watchWindow = getFrame(runner).contentWindow;
 }
 
-/* ask for 'to' flow from transfer page */
 const transfer_save_contractID = "@aasii.org/test/transfer-save;1";
 const transfer_save_name = "aaVCTransferSaveTest";
 const transfer_save_CID = Components.ID("{bcb12042-4b82-4e71-949b-228b444e344c}");
@@ -828,6 +832,22 @@ function transfer_save_test(runner)
   if (getElement(runner,"transfer.commit").hasAttribute("disabled"))
     runner.addJSFailure("[transfer save] 'commit' not enabled");
 
+  sendOnClick(getElement(runner, "transfer.fromFlow"));
+  runner.watchWindow = getFrame(runner).contentWindow;
+}
+
+function submit_after_reset_check(runner)
+{
+  var amount = getElement(runner, "transfer.amount");
+  var date = getElement(runner, "transfer.date");
+  var commit = getElement(runner, "transfer.commit");
+  var value = getElement(runner, "transfer.value");
+  var earnings = getElement(runner, "transfer.earnings");
+  var reset = getElement(runner, "transfer.reset");
+
+  if (getElement(runner, "transfer.fromFlow").value != "b")
+    runner.addJSFailure("submit after reset failed:"
+        + getElement(runner, "transfer.fromFlow").value);
   /* Prepare direct database access */
   var wnd = getFrame(runner).contentWindow.wrappedJSObject;
   var session = getFrame(runner).docShell.QueryInterface(nsCI.nsIWebNavigation)
@@ -865,7 +885,7 @@ function transfer_save_test(runner)
   flows.load();
 
   /* Add transfer 'b'->'c' of 200 */
-  wnd.gFact.takeFrom = flows.queryElementAt(1, nsCI.aaIFlow);
+  //wnd.gFact.takeFrom = flows.queryElementAt(1, nsCI.aaIFlow);
   wnd.gFact.giveTo = flows.queryElementAt(2, nsCI.aaIFlow);
   amount.value = "200";
   sendOnInput(amount);
@@ -892,6 +912,10 @@ function transfer_save_test(runner)
     runner.addJSFailure("[transfer save] wrong earnings:" + earnings.value);
 }
 
+const submit_after_reset_contractID = "@aasii.org/test/submit-after-reset;1";
+const submit_after_reset_name = "aaVCTransferToSubmitAfterReset";
+const submit_after_reset_CID = Components.ID("{412fc32b-1aed-4efa-8456-ae5a4c2ef29a}");
+
 /* test for bug 128 */
 function add_flow_when_selecting_check(runner)
 {
-- 
2.11.4.GIT