Merge pull request #1058 from urbit/next

release "next"

.travis/pin-vere-commit.txt

@@ -1 +1 @@
-051f31b31e45c57aee5542522c5c38e146f3e012
+315634d99b0a0d7760267eacc0b32465e03ea981

.travis/test.js

@@ -9,7 +9,7 @@ var actions = runner.actions
 var args  = ['-B', 'urbit.pill', '-A', '..', '-cSF', 'zod', 'zod'];
 var urbit = new Urbit(args);
 
-//  XX upstream the following into runner-js
+//  XX upstream this into runner-js
 //
 function rePill(urb) {
   return new Promise(function(resolve,reject){
@@ -59,6 +59,11 @@ function rePill(urb) {
 
           return read.pipe(write)
         })
+        //  XX find a better way to add this to the promise chain
+        //
+        .then(function(){
+          return barMass(urb);
+        })
         .catch(function(err){
           return reject(err)
         });
@@ -67,6 +72,16 @@ function rePill(urb) {
   })
 }
 
+//  XX upstream this into runner-js
+//
+function barMass(urb) {
+  return urb.line("|mass")
+  .then(function(){
+    return urb.expectEcho("%ran-mass")
+    .then(function(){ return urb.resetListeners(); })
+  })
+}
+
 Promise.resolve(urbit)
 //  XX temporary
 //  send ctrl-x to select dojo
@@ -79,15 +94,14 @@ Promise.resolve(urbit)
   .then(function() { return urbit })
 })
 .then(actions.safeBoot)
+.then(function(){
+  return barMass(urbit);
+})
 .then(actions.test)
 .then(actions.testCores)
 .then(actions.testRenderers)
 .then(function(){
-  return urbit.line("|mass")
-  .then(function(){
-    return urbit.expectEcho("%ran-mass")
-    .then(function(){ return urbit.resetListeners(); })
-  })
+  return barMass(urbit);
 })
 .then(function(){
   return rePill(urbit);