Skip to content
This repository has been archived by the owner on Jul 29, 2024. It is now read-only.

chore(clang-format): reformat all #3686

Merged
merged 1 commit into from
Nov 2, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
147 changes: 56 additions & 91 deletions lib/browser.ts

Large diffs are not rendered by default.

13 changes: 4 additions & 9 deletions lib/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,8 @@ optimist
.describe('browser', 'Browsername, e.g. chrome or firefox')
.describe('seleniumAddress', 'A running selenium address to use')
.describe('seleniumSessionId', 'Attaching an existing session id')
.describe(
'seleniumServerJar', 'Location of the standalone selenium jar file')
.describe(
'seleniumPort', 'Optional port for the selenium standalone server')
.describe('seleniumServerJar', 'Location of the standalone selenium jar file')
.describe('seleniumPort', 'Optional port for the selenium standalone server')
.describe('baseUrl', 'URL to prepend to all relative paths')
.describe('rootElement', 'Element housing ng-app, if not html or body')
.describe('specs', 'Comma-separated list of files to test')
Expand All @@ -57,9 +55,7 @@ optimist
.describe('resultJsonOutputFile', 'Path to save JSON test result')
.describe('troubleshoot', 'Turn on troubleshooting output')
.describe('elementExplorer', 'Interactively test Protractor commands')
.describe(
'debuggerServerPort',
'Start a debugger server at specified port instead of repl')
.describe('debuggerServerPort', 'Start a debugger server at specified port instead of repl')
.alias('browser', 'capabilities.browserName')
.alias('name', 'capabilities.name')
.alias('platform', 'capabilities.platform')
Expand All @@ -84,8 +80,7 @@ if (argv.help) {
}

if (argv.version) {
console.log(
'Version ' + require(path.join(__dirname, '../package.json')).version);
console.log('Version ' + require(path.join(__dirname, '../package.json')).version);
process.exit(0);
}

Expand Down
Loading