Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BD785200B8D for ; Fri, 9 Sep 2016 00:52:02 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BA6DA160AD0; Thu, 8 Sep 2016 22:52:02 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0C804160AAD for ; Fri, 9 Sep 2016 00:52:01 +0200 (CEST) Received: (qmail 36406 invoked by uid 500); 8 Sep 2016 22:52:01 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 36368 invoked by uid 99); 8 Sep 2016 22:52:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Sep 2016 22:52:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 12C7CDFD9F; Thu, 8 Sep 2016 22:52:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shazron@apache.org To: commits@cordova.apache.org Message-Id: <4bd77886c0a64fe7bfc0291ce0be47cc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cordova-plugin-wkwebview-engine git commit: CB-11824 - Update tests to include objective-c tests Date: Thu, 8 Sep 2016 22:52:01 +0000 (UTC) archived-at: Thu, 08 Sep 2016 22:52:02 -0000 Repository: cordova-plugin-wkwebview-engine Updated Branches: refs/heads/master 88054455c -> f9fa06ff0 CB-11824 - Update tests to include objective-c tests This closes #19 Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine/commit/f9fa06ff Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine/tree/f9fa06ff Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine/diff/f9fa06ff Branch: refs/heads/master Commit: f9fa06ff036ba668beca2f70bf16e9bae864b4de Parents: 8805445 Author: Shazron Abdullah Authored: Thu Sep 8 02:43:50 2016 -0700 Committer: Shazron Abdullah Committed: Thu Sep 8 15:50:42 2016 -0700 ---------------------------------------------------------------------- .travis.yml | 14 +++++++++++--- package.json | 9 ++++----- .../CDVWKWebViewEngineTest.xcodeproj/project.pbxproj | 13 ++----------- tests/ios/package.json | 2 +- 4 files changed, 18 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine/blob/f9fa06ff/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index b9af4c5..83aaf0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,12 @@ -language: node_js +osx_image: xcode7.3 +language: objective-c sudo: false -node_js: - - "4.2" +before_install: + - npm cache clean -f + - npm install -g n + - n stable + - node --version +install: + - npm install +script: + - npm test http://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine/blob/f9fa06ff/package.json ---------------------------------------------------------------------- diff --git a/package.json b/package.json index 1065738..506ad1c 100644 --- a/package.json +++ b/package.json @@ -3,9 +3,6 @@ "version": "1.0.4-dev", "description": "The official Apache Cordova WKWebView Engine Plugin", "main": "index.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, "repository": { "type": "git", "url": "https://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine.git" @@ -15,8 +12,10 @@ "wkwebview" ], "scripts": { - "test": "npm run jshint", - "jshint": "node node_modules/jshint/bin/jshint src" + "test": "npm run jshint && npm run objc-tests", + "objc-tests": "cd tests/ios && npm test", + "preobjc-tests": "cd tests/ios && npm install", + "jshint": "node_modules/.bin/jshint src" }, "author": "Apache Cordova", "license": "Apache-2.0", http://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine/blob/f9fa06ff/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/project.pbxproj ---------------------------------------------------------------------- diff --git a/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/project.pbxproj b/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/project.pbxproj index 74436bd..14a8d3b 100644 --- a/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/project.pbxproj +++ b/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/project.pbxproj @@ -329,12 +329,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "\"$(TARGET_BUILD_DIR)/usr/local/lib/include\"", - "\"$(OBJROOT)/UninstalledProducts/include\"", - "\"$(BUILT_PRODUCTS_DIR)\"", - ); + HEADER_SEARCH_PATHS = "$(inherited)"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -372,11 +367,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "\"$(TARGET_BUILD_DIR)/usr/local/lib/include\"", - "\n\"$(OBJROOT)/UninstalledProducts/include\"\n\"$(BUILT_PRODUCTS_DIR)\"", - ); + HEADER_SEARCH_PATHS = "$(inherited)"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = "-ObjC"; http://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine/blob/f9fa06ff/tests/ios/package.json ---------------------------------------------------------------------- diff --git a/tests/ios/package.json b/tests/ios/package.json index 4c1ace3..e747d3b 100644 --- a/tests/ios/package.json +++ b/tests/ios/package.json @@ -8,6 +8,6 @@ "cordova-ios": "*" }, "scripts": { - "test": "xcodebuild test -workspace CDVWKWebViewEngineTest.xcworkspace -scheme CDVWKWebViewEngineLibTests -destination 'platform=iOS Simulator,name=iPhone 5' CONFIGURATION_BUILD_DIR='/tmp' HEADER_SEARCH_PATHS='$(OBJROOT)/UninstalledProducts/$(PLATFORM_NAME)/include'" + "test": "xcodebuild test -workspace CDVWKWebViewEngineTest.xcworkspace -scheme CDVWKWebViewEngineLibTests -destination \"platform=iOS Simulator,name=iPhone 5\"" } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org