Skip to content

Commit

Permalink
Add webrtc-utilites as dependency which takes care of the testing deps
Browse files Browse the repository at this point in the history
  • Loading branch information
KaptenJansson committed Feb 23, 2016
1 parent d05df14 commit 344988b
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 101 deletions.
8 changes: 7 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,18 @@ matrix:

allow_failures:
- env: BROWSER=chrome BVER=unstable
- env: BROWSER=firefox BVER=stable
- env: BROWSER=firefox BVER=beta

before_install:
- npm install -g npm@'>=3.0.0'

before_script:
- npm install
- bower update
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- /sbin/start-stop-daemon --start --quiet --pidfile /tmp/cucumber_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1600x1200x16


script:
- grunt
Expand Down
10 changes: 3 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
"type": "git",
"url": "git://github.com/webrtc/testrtc"
},
"license": "BSD-3-Clause",
"authors": [
"The WebRTC project authors (http://www.webrtc.org/)"
],
"scripts": {
"test": "grunt build && test/run-tests",
"build": "grunt build",
"lint": "grunt"
"test": "grunt build && start-tests"
},
"devDependencies": {
"grunt-contrib-clean": "~0.6.0",
Expand All @@ -25,9 +24,6 @@
"grunt-vulcanize": "~1.0.0",
"grunt": "~0.4.5",
"bower": "~1.4.1",
"chromedriver": "^2.16.0",
"selenium-webdriver": "^2.46.0",
"tape": "^4.0.0",
"travis-multirunner": "^3.0.0"
"webrtc-utilities": ">=0.0.1"
}
}
19 changes: 0 additions & 19 deletions test/run-tests

This file was deleted.

2 changes: 1 addition & 1 deletion test/tests.js → test/run-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ require('./sanity-test');
// This is run as a test so it is executed after all tests
// have completed.
test('Shutdown', function(t) {
var driver = require('./selenium-lib').buildDriver();
var driver = require('webrtc-utilities').seleniumLib.buildDriver();
driver.close()
.then(function() {
driver.quit().then(function() {
Expand Down
5 changes: 2 additions & 3 deletions test/sanity-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
var test = require('tape');

var webdriver = require('selenium-webdriver');
var seleniumHelpers = require('./selenium-lib');
var seleniumHelpers = require('webrtc-utilities').seleniumLib;

test('Run TestRTC', function(t) {
// FIXME: use env[SELENIUM_BROWSER] instead?
Expand All @@ -30,8 +30,7 @@ test('Run TestRTC', function(t) {
})
.then(function(element) {
t.pass('Located startButton');
return new webdriver.ActionSequence(driver).
doubleClick(element).perform();
return element.click();
})
.then(function() {
t.pass('Clicked on startButton.');
Expand Down
70 changes: 0 additions & 70 deletions test/selenium-lib.js

This file was deleted.

0 comments on commit 344988b

Please sign in to comment.