Merge pull request #318 from NativeScript/svetoslavtsenov/fix-tslint-…

…error fix: tslint error
NativeScript · Aug 9, 2018 · 0486e08 · 0486e08
2 parents 51b0787 + 687d4b1
commit 0486e08
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -47,7 +47,7 @@ matrix:
       os: linux
       node_js: "8"
       script:
-        - npm i -g appium@1.8.0
+      #  - npm i -g appium@1.8.0
         - npm i
         - travis_retry npm run e2e -- --runType android23 --sauceLab --appPath $ANDROID_PACKAGE
     - os: linux
@@ -56,7 +56,7 @@ matrix:
       language: node_js 
       node_js: "8"
       script: 
-        - npm i -g appium@1.8.0
+      #  - npm i -g appium@1.8.0
         - npm i
         - travis_wait travis_retry npm run e2e -- --runType sim.iPhone8 --sauceLab --appPath $IOS_PACKAGE
 android:

diff --git a/app/login/login.component.ts b/app/login/login.component.ts
@@ -96,7 +96,7 @@ export class LoginComponent implements OnInit {
           this.toggleDisplay();
         },
         (errorDetails) => {
-          if (errorDetails.error && errorDetails.error.error == "UserAlreadyExists") {
+          if (errorDetails.error && errorDetails.error.error === "UserAlreadyExists") {
             alert("This email address is already in use.");
           } else {
             alert("Unfortunately we were unable to create your account.");

diff --git a/e2e/groceries.e2e.ts b/e2e/groceries.e2e.ts
@@ -1,10 +1,5 @@
 import { AppiumDriver, createDriver, SearchOptions } from "nativescript-dev-appium";
-import { isSauceLab, runType, capabilitiesName } from "nativescript-dev-appium/lib/parser";
 import { expect } from "chai";
-import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
-
-const isSauceRun = isSauceLab;
-const isAndroid: string = runType.includes("android");
 
 describe("Groceries", async function () {
     let driver: AppiumDriver;
@@ -26,7 +21,7 @@ describe("Groceries", async function () {
     const forgotPasswordFormText = "reset";
 
     const clickOnCrossOrCheckboxBtn = async () => {
-        if (isAndroid) {
+        if (driver.isAndroid) {
             // First image is the menu, second is the cross button. The rest are pairs checkbox/bin per list item.
             const allImages = await driver.findElementsByClassName(driver.locators.image);
             await allImages[2].click(); // Checkbox button
@@ -36,7 +31,7 @@ describe("Groceries", async function () {
     };
 
     const clickOnBinButton = async () => {
-        if (isAndroid) {
+        if (driver.isAndroid) {
             // First image is the menu, second is the cross button. The rest are pairs checkbox/bin per list item.
             const allImages = await driver.findElementsByClassName(driver.locators.image);
             for (let i = 3; i < allImages.length; i = i + 2) {
@@ -56,7 +51,7 @@ describe("Groceries", async function () {
     });
 
     after(async () => {
-        if (isSauceRun) {
+        if (driver.nsCapabilities.isSauceLab) {
             driver.sessionId().then(function (sessionId) {
                 console.log("Report: https://saucelabs.com/beta/tests/" + sessionId);
             });
@@ -68,11 +63,11 @@ describe("Groceries", async function () {
     it("should log in", async () => {
         const loginButton = await driver.findElementByText(loginButtonText, SearchOptions.exact);
         await loginButton.click();
-        if (isAndroid) {
+        if (driver.isAndroid) {
             const allFields = await driver.findElementsByClassName(driver.locators.getElementByName("textfield"));
             await allFields[0].sendKeys(email);
             await allFields[1].sendKeys(password);
-            if (isSauceLab) {
+            if (driver.nsCapabilities.isSauceLab) {
                 await driver.driver.hideDeviceKeyboard("Done");
             }
         } else {
@@ -141,7 +136,7 @@ describe("Groceries", async function () {
 
     it("should log off", async () => {
         // First image is the menu, second is the clock/cross button. The rest are pairs checkbox/bin per list item.
-        await driver.driver.sleep(2000);
+        await driver.sleep(2000);
         const allImages = await driver.findElementsByClassName(driver.locators.image);
         await allImages[0].click(); // Menu button
         const logOffButton = await driver.findElementByText(logOffButtonText);
@@ -155,8 +150,8 @@ describe("Groceries", async function () {
         await loginButton.click();
         const usernameField = await driver.findElementByClassName(driver.locators.getElementByName("textfield"));
         await usernameField.sendKeys(invalidEmail);
-        if (isAndroid) {
-            if (isSauceLab) {
+        if (driver.isAndroid) {
+            if (driver.nsCapabilities.isSauceLab) {
                 await driver.driver.hideDeviceKeyboard("Done");
             }
         } else {

diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "publish-ios-bundle": "npm run ns-bundle --ios --publish-app",
     "generate-android-snapshot": "generate-android-snapshot --targetArchs arm,arm64,ia32 --install",
     "e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",
-    "compile-tests": "tsc -p e2e --watch"
+    "watch-tests": "tsc -p e2e --watch"
   },
   "dependencies": {
     "@angular/common": "~6.0.6",
@@ -72,10 +72,10 @@
     "karma-nativescript-launcher": "^0.4.0",
     "lazy": "1.0.11",
     "nativescript-css-loader": "~0.26.0",
-    "nativescript-dev-appium": "4.0.0",
+    "nativescript-dev-appium": "~4.0.6",
     "nativescript-dev-typescript": "^0.6.0",
     "nativescript-dev-webpack": "^0.14.0",
     "tslint": "^5.4.2",
     "typescript": "~2.7.2"
   }
-}
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -21,6 +21,7 @@
     },
     "exclude": [
         "node_modules",
-        "platforms"
+        "platforms",
+        "e2e"
     ]
 }