starred/stf-DeviceFarmer
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-17 23:53:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

protractor.getInstance() -> browser

Browse Source
This commit is contained in:
Vishal Banthia
2015-11-25 02:05:22 +09:00
parent ddc24e5dc5
commit 6ca08d7b90
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/test/e2e/control/control-spec.js
View File

@@ -4,7 +4,7 @@ describe('Control Page', function () {
var ControlPage = function () { var ControlPage = function () {
this.get = function () { this.get = function () {
browser.get(protractor.getInstance().baseUrl + 'control') browser.get(browser.baseUrl + 'control')
} }
this.kickDeviceButton = element.all(by.css('.kick-device')).first() this.kickDeviceButton = element.all(by.css('.kick-device')).first()
this.kickDevice = function () { this.kickDevice = function () {
@@ -27,7 +27,7 @@ describe('Control Page', function () {
browser.sleep(500) browser.sleep(500)
browser.getLocationAbsUrl().then(function (newUrl) { browser.getLocationAbsUrl().then(function (newUrl) {
expect(newUrl).toMatch(protractor.getInstance().baseUrl + 'control') expect(newUrl).toMatch(browser.baseUrl + 'control')
}) })
}) })
@@ -138,7 +138,7 @@ describe('Control Page', function () {
waitUrl(/devices/) waitUrl(/devices/)
browser.getLocationAbsUrl().then(function (newUrl) { browser.getLocationAbsUrl().then(function (newUrl) {
expect(newUrl).toBe(protractor.getInstance().baseUrl + 'devices') expect(newUrl).toBe(browser.baseUrl + 'devices')
}) })
}) })

2
res/test/e2e/devices/devices-spec.js
View File

@@ -7,7 +7,7 @@ describe('Device Page', function () {
it('should go to Devices List page', function () { it('should go to Devices List page', function () {
deviceListPage.get() deviceListPage.get()
browser.getLocationAbsUrl().then(function (newUrl) { browser.getLocationAbsUrl().then(function (newUrl) {
expect(newUrl).toBe(protractor.getInstance().baseUrl + 'devices') expect(newUrl).toBe(browser.baseUrl + 'devices')
}) })
}) })

2
res/test/e2e/devices/index.js
View File

@@ -1,7 +1,7 @@
module.exports = function DeviceListPage() { module.exports = function DeviceListPage() {
this.get = function () { this.get = function () {
// TODO: Let's get rid off the login first // TODO: Let's get rid off the login first
browser.get(protractor.getInstance().baseUrl + 'devices') browser.get(browser.baseUrl + 'devices')
} }
this.devices = element(by.model('tracker.devices')) this.devices = element(by.model('tracker.devices'))
this.devicesByCss = element.all(by.css('ul.devices-icon-view > li')) this.devicesByCss = element.all(by.css('ul.devices-icon-view > li'))

2
res/test/e2e/help/help-spec.js
View File

@@ -1,7 +1,7 @@
describe('Help Page', function () { describe('Help Page', function () {
//var HelpPage = function () { //var HelpPage = function () {
// this.get = function () { // this.get = function () {
// browser.get(protractor.getInstance().baseUrl + 'help') // browser.get(browser.baseUrl + 'help')
// } // }
//} //}
}) })

2
res/test/e2e/login/index.js
View File

@@ -1,5 +1,5 @@
module.exports = function LoginPage() { module.exports = function LoginPage() {
this.login = protractor.getInstance().params.login this.login = browser.params.login
this.get = function () { this.get = function () {
return browser.get(this.login.url) return browser.get(this.login.url)

2
res/test/e2e/login/login-spec.js
View File

@@ -9,7 +9,7 @@ describe('Login Page', function () {
it('should login with method: "' + loginPage.login.method + '"', function () { it('should login with method: "' + loginPage.login.method + '"', function () {
loginPage.doLogin().then(function () { loginPage.doLogin().then(function () {
browser.getLocationAbsUrl().then(function (newUrl) { browser.getLocationAbsUrl().then(function (newUrl) {
expect(newUrl).toBe(protractor.getInstance().baseUrl + 'devices') expect(newUrl).toBe(browser.baseUrl + 'devices')
}) })
}) })
}) })

2
res/test/e2e/settings/settings-spec.js
View File

@@ -1,7 +1,7 @@
describe('Settings Page', function () { describe('Settings Page', function () {
//var SettingsPage = function () { //var SettingsPage = function () {
// this.get = function () { // this.get = function () {
// browser.get(protractor.getInstance().baseUrl + 'settings') // browser.get(browser.baseUrl + 'settings')
// } // }
//} //}
}) })

2
res/test/protractor.conf.js
View File

@@ -17,7 +17,7 @@ module.exports.config = {
params: { params: {
login: { login: {
url: process.env.STF_LOGINURL || process.env.STF_URL || url: process.env.STF_LOGINURL || process.env.STF_URL ||
'http://localhost:7120', 'http://localhost:7100',
username: process.env.STF_USERNAME || 'test_user', username: process.env.STF_USERNAME || 'test_user',
email: process.env.STF_EMAIL || 'test_user@login.local', email: process.env.STF_EMAIL || 'test_user@login.local',
password: process.env.STF_PASSWORD, password: process.env.STF_PASSWORD,