CB-10679: Improving version choosing logic test coverage This closes #406
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/317cfdb3 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/317cfdb3 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/317cfdb3 Branch: refs/heads/common-1.1.x Commit: 317cfdb374b9dfa215de77c617db0c373dc098c6 Parents: e740deb Author: riknoll <richard.b.kn...@gmail.com> Authored: Mon Mar 7 16:10:22 2016 -0800 Committer: riknoll <richard.b.kn...@gmail.com> Committed: Wed Mar 9 09:39:48 2016 -0800 ---------------------------------------------------------------------- .../plugins/cordova-lib-test-plugin/LICENSE | 202 +++++++++++++++++++ .../plugins/cordova-lib-test-plugin/NOTICE | 5 + .../cordova-lib-test-plugin/package.json | 28 +++ .../plugins/cordova-lib-test-plugin/plugin.xml | 4 + cordova-lib/spec-cordova/plugin.spec.js | 45 ++++- 5 files changed, 280 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/317cfdb3/cordova-lib/spec-cordova/fixtures/plugins/cordova-lib-test-plugin/LICENSE ---------------------------------------------------------------------- diff --git a/cordova-lib/spec-cordova/fixtures/plugins/cordova-lib-test-plugin/LICENSE b/cordova-lib/spec-cordova/fixtures/plugins/cordova-lib-test-plugin/LICENSE new file mode 100644 index 0000000..9b5e401 --- /dev/null +++ b/cordova-lib/spec-cordova/fixtures/plugins/cordova-lib-test-plugin/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/317cfdb3/cordova-lib/spec-cordova/fixtures/plugins/cordova-lib-test-plugin/NOTICE ---------------------------------------------------------------------- diff --git a/cordova-lib/spec-cordova/fixtures/plugins/cordova-lib-test-plugin/NOTICE b/cordova-lib/spec-cordova/fixtures/plugins/cordova-lib-test-plugin/NOTICE new file mode 100644 index 0000000..27bc4a0 --- /dev/null +++ b/cordova-lib/spec-cordova/fixtures/plugins/cordova-lib-test-plugin/NOTICE @@ -0,0 +1,5 @@ +Apache Cordova +Copyright 2012 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/317cfdb3/cordova-lib/spec-cordova/fixtures/plugins/cordova-lib-test-plugin/package.json ---------------------------------------------------------------------- diff --git a/cordova-lib/spec-cordova/fixtures/plugins/cordova-lib-test-plugin/package.json b/cordova-lib/spec-cordova/fixtures/plugins/cordova-lib-test-plugin/package.json new file mode 100644 index 0000000..1c64679 --- /dev/null +++ b/cordova-lib/spec-cordova/fixtures/plugins/cordova-lib-test-plugin/package.json @@ -0,0 +1,28 @@ +{ + "name": "cordova-lib-test-plugin", + "version": "1.3.0", + "description": "Empty plugin used as part of the tests in cordova-lib", + "cordova": { + "id": "cordova-lib-test-plugin", + "platforms": [] + }, + "repository": { + "type": "git", + "url": "git://git-wip-us.apache.org/repos/asf/cordova-lib.git" + }, + "author": "Apache Software Foundation", + "license": "Apache-2.0", + "engines": { + "cordovaDependencies": { + "0.0.0": { + "cordova-android": "<2.1.0" + }, + "1.1.2": { + "cordova-android": ">=2.1.0 <4.0.0" + }, + "1.3.0": { + "cordova-android": "4.0.0" + } + } + } +} http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/317cfdb3/cordova-lib/spec-cordova/fixtures/plugins/cordova-lib-test-plugin/plugin.xml ---------------------------------------------------------------------- diff --git a/cordova-lib/spec-cordova/fixtures/plugins/cordova-lib-test-plugin/plugin.xml b/cordova-lib/spec-cordova/fixtures/plugins/cordova-lib-test-plugin/plugin.xml new file mode 100644 index 0000000..c2748bf --- /dev/null +++ b/cordova-lib/spec-cordova/fixtures/plugins/cordova-lib-test-plugin/plugin.xml @@ -0,0 +1,4 @@ +<?xml version='1.0' encoding='utf-8'?> +<plugin id="cordova-lib-test-plugin" version="0.0.0" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android"> + <name>cordova-lib-test-plugin</name> +</plugin> http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/317cfdb3/cordova-lib/spec-cordova/plugin.spec.js ---------------------------------------------------------------------- diff --git a/cordova-lib/spec-cordova/plugin.spec.js b/cordova-lib/spec-cordova/plugin.spec.js index 11a1b16..c8a0446 100644 --- a/cordova-lib/spec-cordova/plugin.spec.js +++ b/cordova-lib/spec-cordova/plugin.spec.js @@ -29,9 +29,21 @@ var helpers = require('./helpers'), var tmpDir = helpers.tmpDir('plugin_test'); var project = path.join(tmpDir, 'project'); var pluginsDir = path.join(__dirname, 'fixtures', 'plugins'); + var pluginId = 'org.apache.cordova.fakeplugin1'; var org_test_defaultvariables = 'org.test.defaultvariables'; +// This plugin is published to npm and defines cordovaDependencies +// in its package.json. Based on the dependencies and the version of +// cordova-android installed in our test project, the CLI should +// select version 1.1.2 of the plugin. We don't actually fetch from +// npm, but we do check the npm info. +var npmInfoTestPlugin = 'cordova-lib-test-plugin'; +var npmInfoTestPluginVersion = '1.1.2'; + +var testGitPluginRepository = 'https://github.com/apache/cordova-plugin-device.git'; +var testGitPluginId = 'cordova-plugin-device'; + var results; @@ -125,10 +137,10 @@ describe('plugin end-to-end', function() { }); it('should not check npm info when using the searchpath flag', function(done) { - mockPluginFetch(pluginId, path.join(pluginsDir, 'fake1')); + mockPluginFetch(npmInfoTestPlugin, path.join(pluginsDir, npmInfoTestPlugin)); spyOn(registry, 'info'); - addPlugin(pluginId, pluginId, {searchpath: pluginsDir}, done) + addPlugin(npmInfoTestPlugin, npmInfoTestPlugin, {searchpath: pluginsDir}, done) .then(function() { expect(registry.info).not.toHaveBeenCalled(); @@ -140,10 +152,10 @@ describe('plugin end-to-end', function() { }); it('should not check npm info when using the noregistry flag', function(done) { - mockPluginFetch(pluginId, path.join(pluginsDir, 'fake1')); + mockPluginFetch(npmInfoTestPlugin, path.join(pluginsDir, npmInfoTestPlugin)); spyOn(registry, 'info'); - addPlugin(pluginId, pluginId, {noregistry:true}, done) + addPlugin(npmInfoTestPlugin, npmInfoTestPlugin, {noregistry:true}, done) .then(function() { expect(registry.info).not.toHaveBeenCalled(); @@ -153,4 +165,29 @@ describe('plugin end-to-end', function() { .fail(errorHandler.errorCallback) .fin(done); }); + + it('should not check npm info when fetching from a Git repository', function(done) { + spyOn(registry, 'info'); + addPlugin(testGitPluginRepository, testGitPluginId, {}, done) + .then(function() { + expect(registry.info).not.toHaveBeenCalled(); + }) + .fail(errorHandler.errorCallback) + .fin(done); + }); + + it('should select the plugin version based on npm info when fetching from npm', function(done) { + mockPluginFetch(npmInfoTestPlugin, path.join(pluginsDir, npmInfoTestPlugin)); + + spyOn(registry, 'info').andCallThrough(); + addPlugin(npmInfoTestPlugin, npmInfoTestPlugin, {}, done) + .then(function() { + expect(registry.info).toHaveBeenCalled(); + + var fetchTarget = plugman.raw.fetch.mostRecentCall.args[0]; + expect(fetchTarget).toEqual(npmInfoTestPlugin + '@' + npmInfoTestPluginVersion); + }) + .fail(errorHandler.errorCallback) + .fin(done); + }); }); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org