Skip to content

Commit e981e16

Browse files
committed
update ChromeHeadless, rm PhantomJs references, update github repo link
1 parent 184378f commit e981e16

File tree

6 files changed

+28
-20
lines changed

6 files changed

+28
-20
lines changed

packages/bitcore-lib-cash/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
],
3030
"repository": {
3131
"type": "git",
32-
"url": "https://github.com/bitpay/bitcore-lib/tree/cash"
32+
"url": "https://github.com/bitpay/bitcore/tree/master/packages/bitcore-lib-cash"
3333
},
3434
"browser": {
3535
"request": "browser-request"
@@ -49,7 +49,6 @@
4949
"brfs": "^2.0.1",
5050
"chai": "^4.2.0",
5151
"gulp": "^4.0.0",
52-
"karma-phantomjs-launcher": "^1.0.4",
5352
"sinon": "^7.1.1"
5453
},
5554
"license": "MIT",

packages/bitcore-lib/bitcore-lib.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -11321,7 +11321,7 @@ Transaction.prototype.sort = function() {
1132111321
this.sortInputs(function(inputs) {
1132211322
var copy = Array.prototype.concat.apply([], inputs);
1132311323
copy.sort(function(first, second) {
11324-
return compare(first.prevTxId, second.prevTxId)
11324+
return compare(first.prevTxId, second.prevTxId)
1132511325
|| first.outputIndex - second.outputIndex;
1132611326
});
1132711327
return copy;
@@ -54919,7 +54919,7 @@ module.exports={
5491954919
],
5492054920
"repository": {
5492154921
"type": "git",
54922-
"url": "https://github.com/bitpay/bitcore-lib.git"
54922+
"url": "https://github.com/bitpay/bitcore/tree/master/packages/bitcore-lib"
5492354923
},
5492454924
"browser": {
5492554925
"request": "browser-request"
@@ -54937,7 +54937,6 @@ module.exports={
5493754937
"brfs": "^2.0.1",
5493854938
"chai": "^4.2.0",
5493954939
"gulp": "^4.0.0",
54940-
"karma-phantomjs-launcher": "^1.0.4",
5494154940
"sinon": "^7.1.1"
5494254941
},
5494354942
"license": "MIT",

packages/bitcore-lib/karma.conf.js

+23-11
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,34 @@
44
module.exports = function(config) {
55

66
config.set({
7-
browsers: ['ChromeHeadless'],
8-
frameworks: ['mocha'],
9-
singleRun: false,
10-
reporters: ['progress'],
11-
logLevel: config.LOG_INFO,
12-
// port: 9876, // karma web server port
13-
autoWatch: false,
7+
browsers: ['Firefox'],
8+
frameworks: ['mocha', 'detectBrowsers'],
9+
detectBrowsers: {
10+
enabled: true,
11+
usePhantomJS: false,
12+
postDetection: function(availableBrowser) {
13+
// modify to enable additional browsers if available
14+
var runBrowsers = ['Firefox', 'Chrome'];
15+
var browsers = [];
16+
for(var i = 0; i < runBrowsers.length; i++) {
17+
if(~availableBrowser.indexOf(runBrowsers[i])) {
18+
browsers.push(runBrowsers[i]);
19+
}
20+
}
21+
return browsers;
22+
}
23+
},
24+
singleRun: true,
1425
files: [
15-
'../../tests.js'
26+
'tests.js'
1627
],
1728
plugins: [
1829
'karma-mocha',
19-
'karma-phantomjs-launcher',
2030
'karma-chrome-launcher',
21-
],
22-
browsers: ['PhantomJS', 'Chrome']
31+
'karma-firefox-launcher',
32+
'karma-detect-browsers'
33+
]
34+
browsers: ['Chrome', 'Firefox']
2335
});
2436

2537
};

packages/bitcore-lib/lib/transaction/transaction.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@ Transaction.prototype.sort = function() {
10411041
this.sortInputs(function(inputs) {
10421042
var copy = Array.prototype.concat.apply([], inputs);
10431043
copy.sort(function(first, second) {
1044-
return compare(first.prevTxId, second.prevTxId)
1044+
return compare(first.prevTxId, second.prevTxId)
10451045
|| first.outputIndex - second.outputIndex;
10461046
});
10471047
return copy;

packages/bitcore-lib/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
],
3030
"repository": {
3131
"type": "git",
32-
"url": "https://github.com/bitpay/bitcore-lib.git"
32+
"url": "https://github.com/bitpay/bitcore/tree/master/packages/bitcore-lib"
3333
},
3434
"browser": {
3535
"request": "browser-request"
@@ -47,7 +47,6 @@
4747
"brfs": "^2.0.1",
4848
"chai": "^4.2.0",
4949
"gulp": "^4.0.0",
50-
"karma-phantomjs-launcher": "^1.0.4",
5150
"sinon": "^7.1.1"
5251
},
5352
"license": "MIT",

packages/bitcore-lib/test/transaction/transaction.js

-1
Original file line numberDiff line numberDiff line change
@@ -1163,7 +1163,6 @@ describe('Transaction', function() {
11631163
return original.indexOf(value);
11641164
});
11651165
};
1166-
11671166
fixture.inputs.forEach(function(inputSet) {
11681167
it(inputSet.description, function() {
11691168
var tx = new Transaction();

0 commit comments

Comments
 (0)