Skip to content

Commit 63d103f

Browse files
authored
Merge pull request sass#1733 from xzyfer/feat/poc-testing-install
Adding unit test coverage to install
2 parents 7e27148 + b1188bc commit 63d103f

File tree

3 files changed

+30
-14
lines changed

3 files changed

+30
-14
lines changed

scripts/install.js

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var fs = require('fs'),
99
sass = require('../lib/extensions'),
1010
request = require('request'),
1111
log = require('npmlog'),
12-
pkg = require('../package.json');
12+
userAgent = require('./util/useragent');
1313

1414
/**
1515
* Download file, if succeeds save, if not delete
@@ -53,7 +53,7 @@ function download(url, dest, cb) {
5353
proxy: getProxy(),
5454
timeout: 60000,
5555
headers: {
56-
'User-Agent': getUserAgent(),
56+
'User-Agent': userAgent(),
5757
}
5858
};
5959

@@ -94,18 +94,6 @@ function download(url, dest, cb) {
9494
}
9595
}
9696

97-
/**
98-
* A custom user agent use for binary downloads.
99-
*
100-
* @api private
101-
*/
102-
function getUserAgent() {
103-
return [
104-
'node/', process.version, ' ',
105-
'node-sass-installer/', pkg.version
106-
].join('');
107-
}
108-
10997
/**
11098
* Determine local proxy settings
11199
*

scripts/util/useragent.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
var pkg = require('../../package.json');
2+
3+
/**
4+
* A custom user agent use for binary downloads.
5+
*
6+
* @api private
7+
*/
8+
module.exports = function() {
9+
return [
10+
'node/', process.version, ' ',
11+
'node-sass-installer/', pkg.version
12+
].join('');
13+
};

test/useragent.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
var assert = require('assert'),
2+
pkg = require('../package.json'),
3+
ua = require('../scripts/util/useragent');
4+
5+
describe('util', function() {
6+
describe('useragent', function() {
7+
it('should look as we expect', function() {
8+
var reNode = 'node/' + process.version;
9+
var reSass = 'node-sass-installer/' + pkg.version;
10+
var reUA = new RegExp('^' + reNode + ' ' + reSass + '$');
11+
12+
assert.ok(reUA.test(ua()));
13+
});
14+
});
15+
});

0 commit comments

Comments
 (0)