cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [15/16] cordova-lib git commit: removed integration test for testing ios plugin framework additions with competing cocoapod-based specs. that test coverage has instead moved over to cordova-ios, see https://github.com/apache/cordova-ios/pull/319 for deta
Date Fri, 16 Jun 2017 00:20:09 GMT
removed integration test for testing ios plugin framework additions with competing cocoapod-based
specs. that test coverage has instead moved over to cordova-ios, see https://github.com/apache/cordova-ios/pull/319
for details.


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/f4b77a4d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/f4b77a4d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/f4b77a4d

Branch: refs/heads/master
Commit: f4b77a4d035352444762bed8500c9cd2d503cb43
Parents: 1a632b7
Author: filmaj <maj.fil@gmail.com>
Authored: Tue Jun 13 18:17:31 2017 -0500
Committer: filmaj <maj.fil@gmail.com>
Committed: Tue Jun 13 18:17:31 2017 -0500

----------------------------------------------------------------------
 .../ios-add-plugin-with-cocoapod.spec.js        | 137 -------------------
 .../plugin.xml                                  |  15 --
 .../www/test.js                                 |   0
 .../plugin.xml                                  |  14 --
 .../www/test.js                                 |   0
 5 files changed, 166 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/f4b77a4d/integration-tests/ios-add-plugin-with-cocoapod.spec.js
----------------------------------------------------------------------
diff --git a/integration-tests/ios-add-plugin-with-cocoapod.spec.js b/integration-tests/ios-add-plugin-with-cocoapod.spec.js
deleted file mode 100644
index 365cb4a..0000000
--- a/integration-tests/ios-add-plugin-with-cocoapod.spec.js
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you 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.
-*/
-
-var helpers = require('../spec-cordova/helpers'),
-    path = require('path'),
-    fs = require('fs'),
-    shell = require('shelljs'),
-    cordova_util = ('../src/cordova/util'),
-    cordova = require('../src/cordova/cordova');
-
-
-describe('cocoapod plugin add and rm end-to-end', function () {
-
-    var tmpDir = helpers.tmpDir('cocoapod_plugin_test');
-    var project = path.join(tmpDir, 'hello4');
-
-    var samplePlugin = path.join(__dirname, 'fixtures', 'plugins', 'sample-cordova-plugin-cocoapod-dependent');
-    var overlappingDependencyPlugin = path.join(__dirname, 'fixtures', 'plugins', 'sample-cocoapod-plugin-overlapping-dependency');
-    var AFNetworking = 'AFNetworking',
-        CWStatusBarNotification = 'CWStatusBarNotification';
-    var podfile, podsJSON, workspace;
-
-    beforeEach(function() {
-        process.chdir(tmpDir);
-    });
-
-    afterEach(function() {
-        process.chdir(path.join(__dirname, '..'));  // Needed to rm the dir on Windows.
-        shell.rm('-rf', tmpDir);
-    });
-
-    it('Test 001 : installs and uninstalls plugin depending on new pod and existing pod',
function(done) {
-
-        cordova.create('hello4')
-        .then(function() {
-            process.chdir(project);
-            return cordova.platform('add', 'https://git-wip-us.apache.org/repos/asf/cordova-ios.git');
-        })
-        .then(function() {
-            return cordova.plugin('add', samplePlugin);
-        })
-        .then(function() {
-            podfile = path.resolve('./platforms/ios/Podfile');
-            podsJSON = path.resolve('./platforms/ios/pods.json');
-            workspace = path.resolve('./platforms/ios/HelloCordova.xcworkspace');
-
-            //podfile should have been created
-            fs.exists(podfile, function(podfileExists){
-                expect(podfileExists);
-            });
-
-            //pods.json should have been created
-            fs.exists(podsJSON, function(podsJSONExists){
-                expect(podsJSONExists);
-            });
-
-            //workspace should have been created
-            fs.exists(workspace, function(workspaceCreated){
-                expect(workspaceCreated);
-            });
-
-            var podfileContent = fs.readFileSync(podfile, {'encoding' : 'utf8'});
-            expect(podfileContent.indexOf(AFNetworking) !== -1 );
-
-            var podsJSONContent = require(podsJSON);
-            expect(podsJSONContent[AFNetworking] !== null);
-
-            return cordova.plugin('add', overlappingDependencyPlugin);
-        })
-        .then(function() {
-            var podfileContent = fs.readFileSync(podfile, {'encoding' : 'utf8'});
-            var numberOfTimesAFNetworkingIsInPodfile = podfileContent.match(/AFNetworking/g
|| []).length;
-
-            expect(podfileContent.indexOf(CWStatusBarNotification) !== -1);
-            expect(numberOfTimesAFNetworkingIsInPodfile).toEqual(1); 
-
-            var podsJSONContent = cordova_util.requireNoCache(podsJSON);
-
-            var countPropertyOfAFNetworkingInPodsJSON = podsJSONContent[AFNetworking].count;
-            var specPropertyOfAFNetworkingInPodsJSON = podsJSONContent[AFNetworking].spec;
-
-            expect(countPropertyOfAFNetworkingInPodsJSON).toEqual(2);
-            //spec property should not be changed because of overlapping dependency
-            expect(specPropertyOfAFNetworkingInPodsJSON).toEqual('~> 3.0');
-
-            return cordova.plugin('rm','sample-cocoapod-plugin-overlapping-dependency');
-        })
-        .then(function() {
-            //expect only AFNetworking
-            var podfileContent = fs.readFileSync(podfile, {'encoding' : 'utf8'}); 
-
-            expect(podfileContent.indexOf(CWStatusBarNotification) === -1);
-            expect(podfileContent.indexOf(AFNetworking) !== -1);
-  
-            var podsJSONContent = cordova_util.requireNoCache(podsJSON);
-
-            expect(podsJSONContent[AFNetworking]);
-            expect(podsJSONContent[CWStatusBarNotification] === undefined);
-
-            return cordova.plugin('rm', 'sample-cordova-plugin-cocoapod-dependent');
-        })
-        .then(function() {
-            //expect no pods 
-            cordova_util.requireNoCache(podfile);
-            var podfileContent = fs.readFileSync(podfile, {'encoding' : 'utf8'}); 
-
-            expect(podfileContent.indexOf(CWStatusBarNotification) === -1);
-            expect(podfileContent.indexOf(AFNetworking) === -1);
-
-            var podsJSONContent = cordova_util.requireNoCache(podsJSON);
-
-            expect(podsJSONContent[AFNetworking] === undefined);
-            expect(podsJSONContent[CWStatusBarNotification] === undefined);
-        })
-        .fail(function(err) {
-            console.error(err);
-            expect(err).toBeUndefined();
-        })
-        .fin(done);
-    }, 60000); 
-});

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/f4b77a4d/spec-cordova/fixtures/plugins/sample-cocoapod-plugin-overlapping-dependency/plugin.xml
----------------------------------------------------------------------
diff --git a/spec-cordova/fixtures/plugins/sample-cocoapod-plugin-overlapping-dependency/plugin.xml
b/spec-cordova/fixtures/plugins/sample-cocoapod-plugin-overlapping-dependency/plugin.xml
deleted file mode 100644
index ec193d0..0000000
--- a/spec-cordova/fixtures/plugins/sample-cocoapod-plugin-overlapping-dependency/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    id="sample-cocoapod-plugin-overlapping-dependency"
-    version="1.1.3-dev">
-
-    <name>Test Plugin</name>
-
-    <asset src="www/test.js" target="test.js" />
-    <platform name="ios">
-        <framework src="AFNetworking" spec="~> 2.0" weak="false" type="podspec"/>
-        <framework src="CWStatusBarNotification" weak="false" type="podpsec"/>
-    </platform>
-</plugin>
-

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/f4b77a4d/spec-cordova/fixtures/plugins/sample-cocoapod-plugin-overlapping-dependency/www/test.js
----------------------------------------------------------------------
diff --git a/spec-cordova/fixtures/plugins/sample-cocoapod-plugin-overlapping-dependency/www/test.js
b/spec-cordova/fixtures/plugins/sample-cocoapod-plugin-overlapping-dependency/www/test.js
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/f4b77a4d/spec-cordova/fixtures/plugins/sample-cordova-plugin-cocoapod-dependent/plugin.xml
----------------------------------------------------------------------
diff --git a/spec-cordova/fixtures/plugins/sample-cordova-plugin-cocoapod-dependent/plugin.xml
b/spec-cordova/fixtures/plugins/sample-cordova-plugin-cocoapod-dependent/plugin.xml
deleted file mode 100644
index 6ea800f..0000000
--- a/spec-cordova/fixtures/plugins/sample-cordova-plugin-cocoapod-dependent/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    id="sample-cordova-plugin-cocoapod-dependent"
-    version="1.1.3-dev">
-
-    <name>Test Plugin</name>
-
-    <asset src="www/test.js" target="test.js" />
-    <platform name="ios">
-        <framework src="AFNetworking" spec="~> 3.0" weak="false" type="podspec"/>
-    </platform>
-</plugin>
-

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/f4b77a4d/spec-cordova/fixtures/plugins/sample-cordova-plugin-cocoapod-dependent/www/test.js
----------------------------------------------------------------------
diff --git a/spec-cordova/fixtures/plugins/sample-cordova-plugin-cocoapod-dependent/www/test.js
b/spec-cordova/fixtures/plugins/sample-cordova-plugin-cocoapod-dependent/www/test.js
deleted file mode 100644
index e69de29..0000000


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message