Skip to content
This repository has been archived by the owner on Sep 27, 2022. It is now read-only.

audioAcquisitionProblem event now has an event with a method property #57

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

audioAcquisitionProblem event now has an event with a method property #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
be577c1
Try the sudo required env and see if it's more reliable
Jul 13, 2017
c7e3ca3
Revert "Try the sudo required env and see if it's more reliable"
Jul 13, 2017
d7863db
audioAcquisitionProblem event now has an event with a method property
Aug 23, 2017
3f13ca2
Use functions instead of strings in executeScript
Aug 23, 2017
f4dd8c0
Merge branch 'master' into fix-audio-problem-error
Aug 23, 2017
9977e6e
Merge branch 'use-function-in-execute-script' into fix-audio-problem-…
Aug 23, 2017
5e35d26
Use function in executeScript instead of string
Aug 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions tests/e2e/2browserScenarios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,9 @@ describe('2 browsers in the same room', function() {
beforeEach(function (done) {
secondSubscriber = secondBrowser.element(by.css('ot-subscriber'));
// Move the publisher out of the way
secondBrowser.driver.executeScript('$(\'#facePublisher\').css({top:200, left:0});')
.then(function () {
secondBrowser.driver.executeScript(function() {
$('#facePublisher').css({top:200, left:0});
}).then(function () {
secondBrowser.actions().mouseDown(secondSubscriber).mouseUp().perform();
// Have to wait for the buttons to show up
secondBrowser.sleep(1000).then(function () {
Expand Down
4 changes: 3 additions & 1 deletion tests/e2e/ie/iesmoketest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ describe('IE Smoke Test', function() {
expect(element(by.css('#showEditorBtn')).isPresent()).toBe(true);
// expect(element(by.css('#startArchiveBtn')).isPresent()).toBe(true);
// Open a new window
browser.driver.executeScript('window.open("' + browser.baseUrl + roomName + '");');
browser.driver.executeScript(function() {
window.open(browser.baseUrl + roomName);
});
// Wait for subscriber to show up
browser.wait(function () {
return element(by.css('ot-subscriber')).isPresent();
Expand Down
16 changes: 10 additions & 6 deletions tests/e2e/roomScenarios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,9 @@ describe('Room', function() {
}, 10000);
var audioAcquisitionProblem = element(by.css('#facePublisher audio-acquisition-problem'));
expect(audioAcquisitionProblem.isDisplayed()).toBe(false);
browser.driver.executeScript('OT.publishers.find().trigger(\'audioAcquisitionProblem\');')
.then(function () {
browser.driver.executeScript(function() {
OT.publishers.find().trigger('audioAcquisitionProblem', { method: 'mock' });
}).then(function () {
expect(audioAcquisitionProblem.isDisplayed()).toBe(true);
});
});
Expand All @@ -171,8 +172,10 @@ describe('Room', function() {
var publishErrors = element(by.css('ot-errors'));
expect(publishErrors.isDisplayed()).toBe(false);
expect(publisher.isPresent()).toBe(true);
browser.driver.executeScript('angular.element("ot-publisher").scope().$emit' +
'("otPublisherError", {message:"whatever"}, {id:"facePublisher"})').then(function () {
browser.driver.executeScript(function() {
angular.element("ot-publisher").scope().$emit("otPublisherError",
{message:"whatever"}, {id:"facePublisher"});
}).then(function () {
expect(publishErrors.isDisplayed()).toBe(true);
expect(publisher.isPresent()).toBe(false);
});
Expand Down Expand Up @@ -364,8 +367,9 @@ describe('Room', function() {
it('shows an install prompt when you click it and the extension is not installed',
function (done) {
if (browser.browserName === 'chrome') {
browser.driver.executeScript(
'OT.registerScreenSharingExtension(\'chrome\', \'foo\');').then(function () {
browser.driver.executeScript(function() {
OT.registerScreenSharingExtension('chrome', 'foo');
}).then(function () {
expect(element(by.css('#installScreenshareExtension')).isPresent()).toBe(false);
expect(screenShareBtn.getAttribute('class')).toContain('green');
screenShareBtn.click();
Expand Down
5 changes: 3 additions & 2 deletions tests/e2e/screenScenarios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@ if (browser.params.testScreenSharing) {
it('shows an install prompt when you click it and the extension is not installed',
function (done) {
if (browser.browserName === 'chrome') {
browser.driver.executeScript('OT.registerScreenSharingExtension(\'chrome\', \'foo\');')
.then(function () {
browser.driver.executeScript(function() {
OT.registerScreenSharingExtension('chrome', 'foo');
}).then(function () {
expect(element(by.css('#installScreenshareExtension')).isPresent()).toBe(false);
expect(screenShareBtn.getAttribute('class')).toContain('green');
screenShareBtn.click();
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/audioAcquisitionProblemSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ describe('audioAcquisitionProblem', function () {
expect(scope.showAlert).toBe(false);
OTSession.addPublisher(mockPublisher);
setTimeout(function() {
mockPublisher.trigger('audioAcquisitionProblem');
mockPublisher.trigger('audioAcquisitionProblem', { method: 'mock' });
setTimeout(function() {
expect(scope.showAlert).toBe(true);
done();
Expand Down