Merge pull request #329 from webtorrent/wrtc

Use wrtc for more reliable tests

.travis.yml

@@ -8,4 +8,3 @@ before_script:
   - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
       sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6';
     fi
-  - export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start

package.json

@@ -42,11 +42,11 @@
     "ws": "^7.0.0"
   },
   "devDependencies": {
-    "electron-webrtc": "^0.3.0",
     "magnet-uri": "^5.1.3",
     "standard": "*",
     "tape": "^4.0.0",
-    "webtorrent-fixtures": "^1.3.0"
+    "webtorrent-fixtures": "^1.3.0",
+    "wrtc": "^0.4.1"
   },
   "engines": {
     "node": ">=10"

test/evict.js

@@ -1,9 +1,7 @@
 var Client = require('../')
 var common = require('./common')
 var test = require('tape')
-var electronWebrtc = require('electron-webrtc')
-
-var wrtc
+var wrtc = require('wrtc')
 
 var infoHash = '4cb67059ed6bd08362da625b3ae77f6f4a075705'
 var peerId = Buffer.from('01234567890123456789')
@@ -115,11 +113,5 @@ test('evict: udp server', function (t) {
 })
 
 test('evict: ws server', function (t) {
-  wrtc = electronWebrtc()
-  wrtc.electronDaemon.once('ready', function () {
-    serverTest(t, 'ws', 'inet')
-  })
-  t.once('end', function () {
-    wrtc.close()
-  })
+  serverTest(t, 'ws', 'inet')
 })

test/server.js

@@ -1,9 +1,7 @@
 var Client = require('../')
 var common = require('./common')
 var test = require('tape')
-var electronWebrtc = require('electron-webrtc')
-
-var wrtc
+var wrtc = require('wrtc')
 
 var infoHash = '4cb67059ed6bd08362da625b3ae77f6f4a075705'
 var peerId = Buffer.from('01234567890123456789')
@@ -180,11 +178,5 @@ test('udp server', function (t) {
 })
 
 test('ws server', function (t) {
-  wrtc = electronWebrtc()
-  wrtc.electronDaemon.once('ready', function () {
-    serverTest(t, 'ws', 'inet')
-  })
-  t.once('end', function () {
-    wrtc.close()
-  })
+  serverTest(t, 'ws', 'inet')
 })