From 2fb137eefba11b1ca5139e4f6269451229586cf3 Mon Sep 17 00:00:00 2001 From: Marc Riegel Date: Sun, 26 Jun 2016 08:02:09 +0200 Subject: Feature: Support codeship docker environment variables --- test/getOptions.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/getOptions.js b/test/getOptions.js index 3394a85..b82f365 100644 --- a/test/getOptions.js +++ b/test/getOptions.js @@ -338,6 +338,9 @@ var testCodeship = function(sut, done) { process.env.CI_BUILD_NUMBER = '1234'; process.env.CI_COMMIT_ID = "e3e3e3e3e3e3e3e3e"; process.env.CI_BRANCH = "master"; + process.env.CI_COMMITTER_NAME = "John Doe"; + process.env.CI_COMMITTER_EMAIL = "jd@example.com"; + process.env.CI_COMMIT_MESSAGE = "adadadadadadadadadad"; sut(function(err, options){ options.service_name.should.equal("codeship"); options.service_job_id.should.equal("1234"); @@ -345,9 +348,9 @@ var testCodeship = function(sut, done) { { id: 'e3e3e3e3e3e3e3e3e', author_name: 'Unknown Author', author_email: '', - committer_name: 'Unknown Committer', - committer_email: '', - message: 'Unknown Commit Message' }, + committer_name: 'John Doe', + committer_email: 'jd@example.com', + message: 'adadadadadadadadadad' }, branch: 'master', remotes: [] }); done(); -- cgit v1.2.3 From a87354b2bc947b74bcf338b9eb587c12d9cd5c5a Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Wed, 11 May 2016 21:05:22 +0100 Subject: Update CI, vulnerability checking, and dependencies. --- test/fetchGitData.js | 8 ++++---- test/getOptions.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/fetchGitData.js b/test/fetchGitData.js index cd0a679..012e129 100644 --- a/test/fetchGitData.js +++ b/test/fetchGitData.js @@ -98,14 +98,14 @@ describe("fetchGitData", function(){ "covert": "to a string" } }, function(err, str){ - str.branch.should.be.a("string"); + str.branch.should.be.String(); fetchGitData({ "head": { "id": "COMMIT_HASH" }, "branch": ["convert", "to", "a", "string"] }, function(err, str){ - str.branch.should.be.a("string"); + str.branch.should.be.String(); done(); }); }); @@ -168,11 +168,11 @@ describe("fetchGitData", function(){ process.env.COVERALLS_GIT_BRANCH = "master"; getOptions(function(err, options){ options = options.git; - options.head.should.be.a("object"); + options.head.should.be.Object(); options.head.author_name.should.not.equal("Unknown Author"); options.head.committer_name.should.not.equal("Unknown Committer"); options.head.message.should.not.equal("Unknown Commit Message"); - options.branch.should.be.a("string"); + options.branch.should.be.String(); options.should.have.property("remotes"); options.remotes.should.be.instanceof(Array); options.remotes.length.should.be.above(0); diff --git a/test/getOptions.js b/test/getOptions.js index 3394a85..98c0ea5 100644 --- a/test/getOptions.js +++ b/test/getOptions.js @@ -203,7 +203,7 @@ var testGitBranchDetection = function(sut, done){ if (localGit.branch) options.git.branch.should.equal(localGit.branch); else - options.git.should.not.have.property('branch'); + options.git.should.not.have.key('branch'); localGit.wrapUp(); done(); }); -- cgit v1.2.3 From 377b8a7345858e4af88e5a7dcc51552a8b712aef Mon Sep 17 00:00:00 2001 From: Paul Betts Date: Wed, 17 Aug 2016 13:23:27 -0700 Subject: Add a test --- test/getOptions.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'test') diff --git a/test/getOptions.js b/test/getOptions.js index 3394a85..eefd083 100644 --- a/test/getOptions.js +++ b/test/getOptions.js @@ -418,6 +418,26 @@ var testGitlab = function(sut, done) { }); }; +var testGitlab = function(sut, done) { + process.env.CI_NAME = 'surf'; + process.env.SURF_SHA1 = "e3e3e3e3e3e3e3e3e"; + process.env.SURF_REF = "feature"; + sut(function(err, options){ + options.service_name.should.equal("surf"); + options.git.should.eql({ head: + { id: 'e3e3e3e3e3e3e3e3e', + author_name: 'Unknown Author', + author_email: '', + committer_name: 'Unknown Committer', + committer_email: '', + message: 'Unknown Commit Message' }, + branch: 'feature', + remotes: [] }); + done(); + }); +}; + + function ensureLocalGitContext(options) { var path = require('path'); var fs = require('fs'); -- cgit v1.2.3 From d78dda89ff80acb94d2a90cd7a8b60cf4d14914f Mon Sep 17 00:00:00 2001 From: Paul Betts Date: Wed, 17 Aug 2016 13:32:34 -0700 Subject: I am a dum --- test/getOptions.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/getOptions.js b/test/getOptions.js index eefd083..3fabebd 100644 --- a/test/getOptions.js +++ b/test/getOptions.js @@ -144,6 +144,9 @@ describe("getOptions", function(){ it ("should set service_name and service_job_id if it's running on Gitlab", function(done){ testGitlab(getOptions, done); }); + 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"; @@ -418,7 +421,7 @@ var testGitlab = function(sut, done) { }); }; -var testGitlab = function(sut, done) { +var testSurf = function(sut, done) { process.env.CI_NAME = 'surf'; process.env.SURF_SHA1 = "e3e3e3e3e3e3e3e3e"; process.env.SURF_REF = "feature"; -- cgit v1.2.3