From ad3fa24a28c0ec45dca43a257005626a4027487a Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Wed, 19 Oct 2016 14:55:08 -0700
Subject: Intermediary commit.

---
 test/unit/actions/tx_test.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'test/unit/actions/tx_test.js')

diff --git a/test/unit/actions/tx_test.js b/test/unit/actions/tx_test.js
index c08a8aa26..e365ee3a3 100644
--- a/test/unit/actions/tx_test.js
+++ b/test/unit/actions/tx_test.js
@@ -46,7 +46,7 @@ describe('tx confirmation screen', function() {
     describe('cancelTx', function() {
 
       before(function(done) {
-        actions._setAccountManager({
+        actions._setKeyringController({
           approveTransaction(txId, cb) { cb('An error!') },
           cancelTransaction(txId) { /* noop */ },
           clearSeedWordCache(cb) { cb() },
@@ -75,7 +75,7 @@ describe('tx confirmation screen', function() {
         before(function(done) {
           alert = () => {/* noop */}
 
-          actions._setAccountManager({
+          actions._setKeyringController({
             approveTransaction(txId, cb) { cb({message: 'An error!'}) },
           })
 
@@ -96,7 +96,7 @@ describe('tx confirmation screen', function() {
 
       describe('when there is success', function() {
         it('should complete tx and go home', function() {
-          actions._setAccountManager({
+          actions._setKeyringController({
             approveTransaction(txId, cb) { cb() },
           })
 
@@ -135,7 +135,7 @@ describe('tx confirmation screen', function() {
         }
         freeze(initialState)
 
-        actions._setAccountManager({
+        actions._setKeyringController({
           approveTransaction(txId, cb) { cb() },
         })
 
-- 
cgit 


From 0deed1775237bc8d48eb41e83b5a661b55e4b6be Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 20 Oct 2016 12:07:53 -0700
Subject: Fix tests

---
 test/unit/actions/tx_test.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'test/unit/actions/tx_test.js')

diff --git a/test/unit/actions/tx_test.js b/test/unit/actions/tx_test.js
index e365ee3a3..1f06b1120 100644
--- a/test/unit/actions/tx_test.js
+++ b/test/unit/actions/tx_test.js
@@ -46,7 +46,7 @@ describe('tx confirmation screen', function() {
     describe('cancelTx', function() {
 
       before(function(done) {
-        actions._setKeyringController({
+        actions._setBackgroundConnection({
           approveTransaction(txId, cb) { cb('An error!') },
           cancelTransaction(txId) { /* noop */ },
           clearSeedWordCache(cb) { cb() },
@@ -75,7 +75,7 @@ describe('tx confirmation screen', function() {
         before(function(done) {
           alert = () => {/* noop */}
 
-          actions._setKeyringController({
+          actions._setBackgroundConnection({
             approveTransaction(txId, cb) { cb({message: 'An error!'}) },
           })
 
@@ -96,7 +96,7 @@ describe('tx confirmation screen', function() {
 
       describe('when there is success', function() {
         it('should complete tx and go home', function() {
-          actions._setKeyringController({
+          actions._setBackgroundConnection({
             approveTransaction(txId, cb) { cb() },
           })
 
@@ -135,7 +135,7 @@ describe('tx confirmation screen', function() {
         }
         freeze(initialState)
 
-        actions._setKeyringController({
+        actions._setBackgroundConnection({
           approveTransaction(txId, cb) { cb() },
         })
 
-- 
cgit