fix(ci): Pin clang-format version to fix Circle tests.

Also clang-format with 1.0.49
angular · Apr 11, 2017 · 2685c3c · 2685c3c
1 parent 987a8e3
commit 2685c3c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/lib/browser.ts b/lib/browser.ts
@@ -89,8 +89,8 @@ export interface ElementHelper extends Function {
  */
 function buildElementHelper(browser: ProtractorBrowser): ElementHelper {
   let element = ((locator: Locator) => {
-    return new ElementArrayFinder(browser).all(locator).toElementFinder_();
-  }) as ElementHelper;
+                  return new ElementArrayFinder(browser).all(locator).toElementFinder_();
+                }) as ElementHelper;
 
   element.all = (locator: Locator) => {
     return new ElementArrayFinder(browser).all(locator);
@@ -544,7 +544,7 @@ export class ProtractorBrowser extends AbstractExtendedWebDriver {
    * fork = fork.restartSync();
    * fork.get('page2'); // 'page2' gotten by restarted fork
    *
-   * @throws {TypeError} Will throw an error if the control flow is not enabled 
+   * @throws {TypeError} Will throw an error if the control flow is not enabled
    * @returns {ProtractorBrowser} The restarted browser
    */
   restartSync(): ProtractorBrowser {
@@ -1046,8 +1046,8 @@ export class ProtractorBrowser extends AbstractExtendedWebDriver {
                         clientSideScripts.setLocation, 'Protractor.setLocation()', rootEl, url)
                     .then((browserErr: Error) => {
                       if (browserErr) {
-                        throw 'Error while navigating to \'' + url + '\' : ' +
-                            JSON.stringify(browserErr);
+                        throw 'Error while navigating to \'' + url +
+                            '\' : ' + JSON.stringify(browserErr);
                       }
                     }));
   }
@@ -1059,7 +1059,7 @@ export class ProtractorBrowser extends AbstractExtendedWebDriver {
    * cases it will return `$location.absUrl()` instead.  This function is only here for legacy
    * users, and will probably be removed in Protractor 6.0.
    *
-   * @deprecated Please use `browser.getCurrentUrl()` 
+   * @deprecated Please use `browser.getCurrentUrl()`
    * @example
    * browser.get('http://angular.github.io/protractor/#/api');
    * expect(browser.getLocationAbsUrl())

diff --git a/lib/debugger.ts b/lib/debugger.ts
@@ -49,7 +49,7 @@ export class DebugHelper {
    *     first time that the debugger is called.
    * @param {number=} opt_debugPort Optional port to use for the debugging
    *     process.
-   * 
+   *
    * @return {Promise} If blockUntilExit, a promise resolved when the debugger process
    *     exits. Otherwise, resolved when the debugger process is ready to begin.
    */

diff --git a/lib/driverProviders/sauce.ts b/lib/driverProviders/sauce.ts
@@ -64,9 +64,9 @@ export class Sauce extends DriverProvider {
     this.config_.capabilities['accessKey'] = this.config_.sauceKey;
     this.config_.capabilities['build'] = this.config_.sauceBuild;
     let auth = 'https://' + this.config_.sauceUser + ':' + this.config_.sauceKey + '@';
-    this.config_.seleniumAddress =
-        auth + (this.config_.sauceSeleniumAddress ? this.config_.sauceSeleniumAddress :
-                                                    'ondemand.saucelabs.com:443/wd/hub');
+    this.config_.seleniumAddress = auth +
+        (this.config_.sauceSeleniumAddress ? this.config_.sauceSeleniumAddress :
+                                             'ondemand.saucelabs.com:443/wd/hub');
 
     // Append filename to capabilities.name so that it's easier to identify
     // tests.

diff --git a/lib/expectedConditions.ts b/lib/expectedConditions.ts
@@ -416,19 +416,19 @@ export class ProtractorExpectedConditions {
   }
 
   /**
- * An expectation for checking the selection is selected.
- *
- * @example
- * var EC = protractor.ExpectedConditions;
- * // Waits for the element with id 'myCheckbox' to be selected.
- * browser.wait(EC.elementToBeSelected($('#myCheckbox')), 5000);
- *
- * @alias ExpectedConditions.elementToBeSelected
- * @param {!ElementFinder} elementFinder The element to check
- *
- * @returns {!function} An expected condition that returns a promise
- *     representing whether the element is selected.
- */
+   * An expectation for checking the selection is selected.
+   *
+   * @example
+   * var EC = protractor.ExpectedConditions;
+   * // Waits for the element with id 'myCheckbox' to be selected.
+   * browser.wait(EC.elementToBeSelected($('#myCheckbox')), 5000);
+   *
+   * @alias ExpectedConditions.elementToBeSelected
+   * @param {!ElementFinder} elementFinder The element to check
+   *
+   * @returns {!function} An expected condition that returns a promise
+   *     representing whether the element is selected.
+   */
   elementToBeSelected(elementFinder: ElementFinder): Function {
     return this.and(this.presenceOf(elementFinder), () => {
       return elementFinder.isSelected().then(passBoolean, falseIfMissing);

diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "body-parser": "~1.15.2",
     "chai": "~3.5.0",
     "chai-as-promised": "~5.3.0",
-    "clang-format": "^1.0.34",
+    "clang-format": "1.0.49",
     "expect.js": "~0.3.1",
     "express": "~4.14.0",
     "gulp": "^3.9.1",