Merge branch 'master' into authentication-2

atom · Sep 29, 2017 · 3649a67 · 3649a67
2 parents ce5d58d + d914f30
commit 3649a67
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,8 @@ notifications:
     rooms:
     - secure: om1VFZYOtLRBOHh3+UDms24wIoRsBu73jMrvNoI2/ThElkihHnD6LbdI1qkPEOkufgMlSjTzQml0VqJgN4gACHfB3Y/cx2k0ThUs7H8Zjv7h90xeegMrj5yA+m2ahqln6rZxtSfog/3owYi9m75iZlXKbl72oXBhCrQMcZ4/BIktdLhR8loEZrYoFgxTOxt6kQwHu67WGmtaRdZcp11ve8ToWqp/Wm1IWGRjeNe5C3dHevS4xsUTRK+hoIov1/nwYysQ8RgmxgJGwzwtCjNkwyqwWku9M0ACVqdqXlFYmcNNWWj2e9buVP9mkX9KHVhPaA72CtgPgO1cvV6HFeA4npn/UKHi+FsMfeGBUkUYP+sQ/CauiSq0LW2zoQIlzsFr5GNI5l2kMhQ9cKoA0CMPwfAjK2rRLLx9c61vNjFqVJtL3KiaYsgPnss8CWprvPgCUjWwbPknjY899EVxhP0bcSt1Nyh0XkzFSCFTWGMWwz/u31w3CVOWE0ez1OdjW4is7EmKhH08Zkt46e/Rr5qZFobc9RM1JYhW67rFPvged4eCz0opxrjci2RcYMh/vV+JJF3NYcpxkEI3dRLB1xpQDL0PtEsuvTSIjCRZYcc4RYb+4NDp7vIgMf20Gt+kTwYs30KyCVMTNmWa7x04pClbo/0BN9Q58ZJT8PsCb62W/N4=
 
+install: true
+
 before_script:
   - rm -rf /usr/local/var/postgres
   - initdb /usr/local/var/postgres

diff --git a/test/real-time-package.test.js b/test/real-time-package.test.js
@@ -302,7 +302,7 @@ suite('RealTimePackage', function () {
     const hostEditor1 = await hostEnv.workspace.open(path.join(temp.path(), 'some-file'))
     await condition(() => deepEqual(getPaneItemTitles(guestEnv), ['Remote Buffer: some-file']))
 
-    hostEnv.workspace.closeActivePaneItemOrEmptyPaneOrWindow()
+    hostEditor1.destroy()
     await condition(() => deepEqual(getPaneItemTitles(guestEnv), ['Portal: No Active File']))
 
     await hostEnv.workspace.open(path.join(temp.path(), 'some-file'))