From 785c44cd2a98d9d6ff2c9345887dcdf85d4b17c1 Mon Sep 17 00:00:00 2001 From: DC Date: Thu, 8 Sep 2016 16:40:43 -0700 Subject: [PATCH] Integration test: torrent list --- package.json | 2 +- src/config.js | 7 +- src/renderer/components/modal-ok-cancel.js | 4 +- src/renderer/lib/state.js | 3 +- src/renderer/main.js | 1 + src/renderer/pages/torrent-list-page.js | 3 +- static/main.html | 2 +- static/webtorrent.html | 2 +- test/index.js | 33 ++---- .../torrent-list-cosmos-expand-deselect.png | Bin 0 -> 1221391 bytes .../torrent-list-cosmos-expand-start.png | Bin 0 -> 1236213 bytes .../darwin/torrent-list-cosmos-expand.png | Bin 0 -> 1221359 bytes .../darwin/torrent-list-cosmos-hover.png | Bin 0 -> 1149957 bytes .../darwin/torrent-list-delete-prompt.png | Bin 0 -> 631658 bytes .../darwin/torrent-list-delete.png | Bin 0 -> 631658 bytes .../darwin/torrent-list-deleted.png | Bin 0 -> 795705 bytes .../darwin/torrent-list-hover-download.png | Bin 0 -> 1147194 bytes .../screenshots/darwin/torrent-list-hover.png | Bin 0 -> 1148005 bytes .../darwin/torrent-list-start-download.png | Bin 0 -> 1142931 bytes .../darwin/torrent-list-stop-download.png | Bin 0 -> 1147194 bytes test/setup.js | 37 ++++++- test/test-torrent-list.js | 104 ++++++++++++++++++ 22 files changed, 161 insertions(+), 37 deletions(-) create mode 100644 test/screenshots/darwin/torrent-list-cosmos-expand-deselect.png create mode 100644 test/screenshots/darwin/torrent-list-cosmos-expand-start.png create mode 100644 test/screenshots/darwin/torrent-list-cosmos-expand.png create mode 100644 test/screenshots/darwin/torrent-list-cosmos-hover.png create mode 100644 test/screenshots/darwin/torrent-list-delete-prompt.png create mode 100644 test/screenshots/darwin/torrent-list-delete.png create mode 100644 test/screenshots/darwin/torrent-list-deleted.png create mode 100644 test/screenshots/darwin/torrent-list-hover-download.png create mode 100644 test/screenshots/darwin/torrent-list-hover.png create mode 100644 test/screenshots/darwin/torrent-list-start-download.png create mode 100644 test/screenshots/darwin/torrent-list-stop-download.png create mode 100644 test/test-torrent-list.js diff --git a/package.json b/package.json index daa92d46..c274c57c 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "deep-equal": "^1.0.1", "dlnacasts": "^0.1.0", "drag-drop": "^2.12.1", - "electron": "1.3.3", + "electron": "1.3.5", "es6-error": "^3.0.1", "fs-extra": "^0.30.0", "iso-639-1": "^1.2.1", diff --git a/src/config.js b/src/config.js index 30f5e05a..4a342194 100644 --- a/src/config.js +++ b/src/config.js @@ -36,26 +36,31 @@ module.exports = { DEFAULT_TORRENTS: [ { + testID: 'bbb', name: 'Big Buck Bunny', posterFileName: 'bigBuckBunny.jpg', torrentFileName: 'bigBuckBunny.torrent' }, { + testID: 'cosmos', name: 'Cosmos Laundromat (Preview)', posterFileName: 'cosmosLaundromat.jpg', torrentFileName: 'cosmosLaundromat.torrent' }, { + testID: 'sintel', name: 'Sintel', posterFileName: 'sintel.jpg', torrentFileName: 'sintel.torrent' }, { + testID: 'tears', name: 'Tears of Steel', posterFileName: 'tearsOfSteel.jpg', torrentFileName: 'tearsOfSteel.torrent' }, { + testID: 'wired', name: 'The WIRED CD - Rip. Sample. Mash. Share.', posterFileName: 'wiredCd.jpg', torrentFileName: 'wiredCd.torrent' @@ -111,7 +116,7 @@ function getPath (key) { if (process.type === 'renderer') { return electron.remote.app.getPath(key) } else { - electron.app.getPath(key) + return electron.app.getPath(key) } } diff --git a/src/renderer/components/modal-ok-cancel.js b/src/renderer/components/modal-ok-cancel.js index f5342bae..ddfee4da 100644 --- a/src/renderer/components/modal-ok-cancel.js +++ b/src/renderer/components/modal-ok-cancel.js @@ -9,12 +9,12 @@ module.exports = class ModalOKCancel extends React.Component { return (
diff --git a/src/renderer/lib/state.js b/src/renderer/lib/state.js index 07bf8e9f..2e70f296 100644 --- a/src/renderer/lib/state.js +++ b/src/renderer/lib/state.js @@ -151,7 +151,8 @@ function setupSavedState (cb) { torrentFileName: parsedTorrent.infoHash + '.torrent', magnetURI: parseTorrent.toMagnetURI(parsedTorrent), files: parsedTorrent.files, - selections: parsedTorrent.files.map((x) => true) + selections: parsedTorrent.files.map((x) => true), + testID: t.testID } } } diff --git a/src/renderer/main.js b/src/renderer/main.js index cefc22ca..6b8a217b 100644 --- a/src/renderer/main.js +++ b/src/renderer/main.js @@ -58,6 +58,7 @@ State.load(onState) function onState (err, _state) { if (err) return onError(err) state = window.state = _state // Make available for easier debugging + window.dispatch = dispatch telemetry.init(state) diff --git a/src/renderer/pages/torrent-list-page.js b/src/renderer/pages/torrent-list-page.js index 82933702..c7e38013 100644 --- a/src/renderer/pages/torrent-list-page.js +++ b/src/renderer/pages/torrent-list-page.js @@ -62,6 +62,7 @@ module.exports = class TorrentList extends React.Component { if (!torrentSummary.torrentKey) throw new InvalidTorrentError('Missing torrentKey') return (
- {isSelected ? 'close' : 'add'} + {isSelected ? 'close' : 'add'} ) diff --git a/static/main.html b/static/main.html index 702d5f3e..30c71226 100644 --- a/static/main.html +++ b/static/main.html @@ -3,7 +3,7 @@ - WebTorrent Desktop + Main Window diff --git a/static/webtorrent.html b/static/webtorrent.html index 73a1cc6e..43726bf8 100644 --- a/static/webtorrent.html +++ b/static/webtorrent.html @@ -3,7 +3,7 @@ - WebTorrent Desktop + WebTorrent Hidden Window