[Pkg-javascript-commits] [node-coveralls] 315/332: merge patched into master

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-coveralls.

commit 1302757a634ed8d592bbc065247adf698ee38a32
Merge: 523cdf3 69de69a
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Sep 8 10:28:10 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...-Disable-a-test-that-need-a-full-git-tree.patch | 24 ++++++++++++++++------
 test/getOptions.js                                 |  2 ++
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index d4061c6,0000000..7b38d90
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 1dcb53cbf819c2765d590271200cd9e203f71752
- 1dcb53cbf819c2765d590271200cd9e203f71752
++69de69a22334a1f96e7b0688338ac98d332bca80
++69de69a22334a1f96e7b0688338ac98d332bca80
 +9c96b6a69bb8ff6adb1db5594c487f677762f434
 +9c96b6a69bb8ff6adb1db5594c487f677762f434
 +node-coveralls_2.13.1.orig.tar.gz
 +d70bb9acc1835ec4f063ff9dac5423c17b11f178
 +16983
diff --cc debian/patches/0004-Disable-a-test-that-need-a-full-git-tree.patch
index bb9cac9,0000000..6681a9c
mode 100644,000000..100644
--- a/debian/patches/0004-Disable-a-test-that-need-a-full-git-tree.patch
+++ b/debian/patches/0004-Disable-a-test-that-need-a-full-git-tree.patch
@@@ -1,63 -1,0 +1,75 @@@
- From 1dcb53cbf819c2765d590271200cd9e203f71752 Mon Sep 17 00:00:00 2001
++From 69de69a22334a1f96e7b0688338ac98d332bca80 Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
 +Date: Thu, 7 Sep 2017 23:06:35 +0200
 +Subject: Disable a test that need a full git tree
 +
 +Forwarded; no
 +---
 + test/fetchGitData.js | 3 ++-
-  test/getOptions.js   | 5 ++++-
-  2 files changed, 6 insertions(+), 2 deletions(-)
++ test/getOptions.js   | 7 ++++++-
++ 2 files changed, 8 insertions(+), 2 deletions(-)
 +
 +diff --git a/test/fetchGitData.js b/test/fetchGitData.js
 +index 012e129..cd42605 100644
 +--- a/test/fetchGitData.js
 ++++ b/test/fetchGitData.js
 +@@ -163,6 +163,7 @@ describe("fetchGitData", function(){
 +       done();
 +     });
 +   });
 ++  /*
 +   it("should execute git commands when a valid commit hash is given", function(done) {
 +     process.env.COVERALLS_GIT_COMMIT = "HEAD";
 +     process.env.COVERALLS_GIT_BRANCH = "master";
 +@@ -178,5 +179,5 @@ describe("fetchGitData", function(){
 +       options.remotes.length.should.be.above(0);
 +       done();
 +     });
 +-  });
 ++  });*/
 + });
 +diff --git a/test/getOptions.js b/test/getOptions.js
- index 51e4fa0..c6122ff 100644
++index 51e4fa0..f03ca94 100644
 +--- a/test/getOptions.js
 ++++ b/test/getOptions.js
 +@@ -25,9 +25,11 @@ describe("getBaseOptions", function(){
 +   it ("should detect detached git head if no hash passed in", function(done) {
 +     testGitDetachedHeadDetection(getBaseOptions, done);
 +   });
 ++  /*
 +   it ("should fail local Git detection if no .git directory", function(done) {
 +     testNoLocalGit(getBaseOptions, done);
 +   });
 ++  */
 +   it ("should set repo_token if it exists", function(done){
 +     testRepoToken(getBaseOptions, done);
 +   });
- @@ -143,6 +145,7 @@ describe("getOptions", function(){
++@@ -101,9 +103,11 @@ describe("getOptions", function(){
++   it ("should detect detached git head if no hash passed in", function(done) {
++     testGitDetachedHeadDetection(getOptions, done);
++   });
+++  /*
++   it ("should fail local Git detection if no .git directory", function(done) {
++     testNoLocalGit(getOptions, done);
++   });
+++  */
++   it ("should set repo_token if it exists", function(done){
++     testRepoToken(getOptions, done);
++   });
++@@ -143,6 +147,7 @@ describe("getOptions", function(){
 +   it ("should set service_name and service_job_id if it's running via Surf", function(done){
 +     testSurf(getOptions, done);
 +   });
 ++  /*
 +   it ("should override set options with user options", function(done){
 +     var userOptions = {service_name: 'OVERRIDDEN_SERVICE_NAME'};
 +     process.env.COVERALLS_SERVICE_NAME = "SERVICE_NAME";
- @@ -150,7 +153,7 @@ describe("getOptions", function(){
++@@ -150,7 +155,7 @@ describe("getOptions", function(){
 +       options.service_name.should.equal("OVERRIDDEN_SERVICE_NAME");
 +       done();
 +     }, userOptions);
 +-  });
 ++  });*/
 + });
 + 
 + var testServiceJobId = function(sut, done){

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-coveralls.git