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 36F91200CB6 for ; Thu, 29 Jun 2017 21:41:07 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 359F1160BED; Thu, 29 Jun 2017 19:41:07 +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 5401B160BC6 for ; Thu, 29 Jun 2017 21:41:06 +0200 (CEST) Received: (qmail 57537 invoked by uid 500); 29 Jun 2017 19:41:05 -0000 Mailing-List: contact issues-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list issues@cordova.apache.org Received: (qmail 57526 invoked by uid 99); 29 Jun 2017 19:41:05 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Jun 2017 19:41:05 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 1BD12CD730 for ; Thu, 29 Jun 2017 19:41:05 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -100.01 X-Spam-Level: X-Spam-Status: No, score=-100.01 tagged_above=-999 required=6.31 tests=[SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001, USER_IN_WHITELIST=-100] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id W43B9FuVTEjm for ; Thu, 29 Jun 2017 19:41:04 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id EF7AB61067 for ; Thu, 29 Jun 2017 19:41:02 +0000 (UTC) Received: from jira-lw-us.apache.org (unknown [207.244.88.139]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 24E6EE06CF for ; Thu, 29 Jun 2017 19:41:02 +0000 (UTC) Received: from jira-lw-us.apache.org (localhost [127.0.0.1]) by jira-lw-us.apache.org (ASF Mail Server at jira-lw-us.apache.org) with ESMTP id 1D1BC245BE for ; Thu, 29 Jun 2017 19:41:01 +0000 (UTC) Date: Thu, 29 Jun 2017 19:41:01 +0000 (UTC) From: "ASF GitHub Bot (JIRA)" To: issues@cordova.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Commented] (CB-12361) Speed up cordova-lib tests MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 archived-at: Thu, 29 Jun 2017 19:41:07 -0000 [ https://issues.apache.org/jira/browse/CB-12361?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16068842#comment-16068842 ] ASF GitHub Bot commented on CB-12361: ------------------------------------- Github user stevengill commented on a diff in the pull request: https://github.com/apache/cordova-lib/pull/573#discussion_r124878443 --- Diff: spec/cordova/platform/addHelper.spec.js --- @@ -16,34 +16,459 @@ */ /* eslint-env jasmine */ +var path = require('path'); +var fs = require('fs'); +var Q = require('q'); +var shell = require('shelljs'); +var events = require('cordova-common').events; +var rewire = require('rewire'); +var platform_addHelper = rewire('../../../src/cordova/platform/addHelper'); +var platform_module = require('../../../src/cordova/platform'); +var platform_metadata = require('../../../src/cordova/platform_metadata'); +var cordova_util = require('../../../src/cordova/util'); +var cordova_config = require('../../../src/cordova/config'); +var plugman = require('../../../src/plugman/plugman'); +var fetch_metadata = require('../../../src/plugman/util/metadata'); +var lazy_load = require('../../../src/cordova/lazy_load'); +// require module here +// spy on it and return +var cordova = require('../../../src/cordova/cordova'); +var prepare = require('../../../src/cordova/prepare'); +var gitclone = require('../../../src/gitclone'); +var fail; + describe('cordova/platform/addHelper', function () { + var projectRoot = '/some/path'; + // These _mock and _revert_mock objects use rewire as the modules these mocks replace + // during testing all return functions, which we cannot spy on using jasmine. + // Thus, we replace these modules inside the scope of addHelper.js using rewire, and shim + // in these _mock test dummies. The test dummies themselves are constructed using + // jasmine.createSpy inside the first beforeEach. + var cfg_parser_mock = function () {}; + var cfg_parser_revert_mock; + var hooks_mock; + var platform_api_mock; + var fetch_mock; + var fetch_revert_mock; + var prepare_mock; + var prepare_revert_mock; + var fake_platform = { + 'platform': 'atari' + }; + beforeEach(function () { + hooks_mock = jasmine.createSpyObj('hooksRunner mock', ['fire']); + hooks_mock.fire.and.returnValue(Q()); + cfg_parser_mock.prototype = jasmine.createSpyObj('config parser mock', ['write', 'removeEngine', 'addEngine', 'getHookScripts']); + cfg_parser_revert_mock = platform_addHelper.__set__('ConfigParser', cfg_parser_mock); + fetch_mock = jasmine.createSpy('fetch mock').and.returnValue(Q()); + fetch_revert_mock = platform_addHelper.__set__('fetch', fetch_mock); + prepare_mock = jasmine.createSpy('prepare mock').and.returnValue(Q()); + prepare_mock.preparePlatforms = jasmine.createSpy('preparePlatforms mock').and.returnValue(Q()); + prepare_revert_mock = platform_addHelper.__set__('prepare', prepare_mock); + spyOn(shell, 'mkdir'); + spyOn(fs, 'existsSync').and.returnValue(false); + spyOn(fs, 'writeFileSync'); + spyOn(cordova_util, 'projectConfig').and.returnValue(path.join(projectRoot, 'config.xml')); + spyOn(cordova_util, 'isDirectory').and.returnValue(false); + spyOn(cordova_util, 'fixRelativePath').and.callFake(function (input) { return input; }); + spyOn(cordova_util, 'isUrl').and.returnValue(false); + spyOn(cordova_util, 'hostSupports').and.returnValue(true); + spyOn(cordova_util, 'removePlatformPluginsJson'); + spyOn(cordova_config, 'read').and.returnValue({}); + // Fake platform details we will use for our mocks, returned by either + // getPlatfromDetailsFromDir (in the local-directory case), or + // downloadPlatform (in every other case) + spyOn(platform_module, 'getPlatformDetailsFromDir').and.returnValue(Q(fake_platform)); + spyOn(platform_addHelper, 'downloadPlatform').and.returnValue(Q(fake_platform)); + spyOn(platform_addHelper, 'getVersionFromConfigFile').and.returnValue(false); + spyOn(platform_addHelper, 'installPluginsForNewPlatform').and.returnValue(Q()); + platform_api_mock = jasmine.createSpyObj('platform api mock', ['createPlatform', 'updatePlatform']); + platform_api_mock.createPlatform.and.returnValue(Q()); + platform_api_mock.updatePlatform.and.returnValue(Q()); + spyOn(cordova_util, 'getPlatformApiFunction').and.returnValue(platform_api_mock); + spyOn(platform_metadata, 'save'); + }); + afterEach(function () { + cfg_parser_revert_mock(); + fetch_revert_mock(); + prepare_revert_mock(); + }); describe('error/warning conditions', function () { - it('should require specifying at least one platform'); - it('should warn if host OS does not support the specified platform'); + it('should require specifying at least one platform', function (done) { + platform_addHelper('add', hooks_mock).then(function () { + fail('addHelper success handler unexpectedly invoked'); + }).fail(function (e) { + expect(e.message).toContain('No platform specified.'); + }).done(done); + }); + + it('should log if host OS does not support the specified platform', function () { + cordova_util.hostSupports.and.returnValue(false); + spyOn(events, 'emit'); + platform_addHelper('add', hooks_mock, projectRoot, ['atari']); + expect(events.emit.calls.mostRecent().args[1]).toContain('can not be built on this OS'); + }); + + it('should throw if platform was already added before adding', function (done) { + fs.existsSync.and.returnValue('/some/path/platforms/ios'); + spyOn(cordova_util, 'requireNoCache').and.returnValue(true); + platform_addHelper('add', hooks_mock, projectRoot, ['ios']).then(function () { + fail('addHelper should throw error'); + }).fail(function (e) { + expect(e.message).toContain('already added.'); + }).done(done); + }); + + it('should throw if platform was not added before updating', function(done) { + platform_addHelper('update', hooks_mock, projectRoot, ['atari']).then(function () { + fail('addHelper should throw error'); --- End diff -- `fail('addHelper success handler unexpectedly invoked');` > Speed up cordova-lib tests > -------------------------- > > Key: CB-12361 > URL: https://issues.apache.org/jira/browse/CB-12361 > Project: Apache Cordova > Issue Type: Improvement > Components: cordova-lib > Reporter: Steve Gill > Assignee: Steve Gill > Labels: cordova-next > > * Split out e2e tests into own folder > * stub i/o and network requests > * use local fixtures when possible & makes sense -- This message was sent by Atlassian JIRA (v6.4.14#64029) --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscribe@cordova.apache.org For additional commands, e-mail: issues-help@cordova.apache.org