File tree 6 files changed +28
-20
lines changed
6 files changed +28
-20
lines changed Original file line number Diff line number Diff line change 29
29
],
30
30
"repository" : {
31
31
"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"
33
33
},
34
34
"browser" : {
35
35
"request" : " browser-request"
49
49
"brfs" : " ^2.0.1" ,
50
50
"chai" : " ^4.2.0" ,
51
51
"gulp" : " ^4.0.0" ,
52
- "karma-phantomjs-launcher" : " ^1.0.4" ,
53
52
"sinon" : " ^7.1.1"
54
53
},
55
54
"license" : " MIT" ,
Original file line number Diff line number Diff line change @@ -11321,7 +11321,7 @@ Transaction.prototype.sort = function() {
11321
11321
this.sortInputs(function(inputs) {
11322
11322
var copy = Array.prototype.concat.apply([], inputs);
11323
11323
copy.sort(function(first, second) {
11324
- return compare(first.prevTxId, second.prevTxId)
11324
+ return compare(first.prevTxId, second.prevTxId)
11325
11325
|| first.outputIndex - second.outputIndex;
11326
11326
});
11327
11327
return copy;
@@ -54919,7 +54919,7 @@ module.exports={
54919
54919
],
54920
54920
"repository": {
54921
54921
"type": "git",
54922
- "url": "https://github.com/bitpay/bitcore-lib.git "
54922
+ "url": "https://github.com/bitpay/bitcore/tree/master/packages/bitcore -lib"
54923
54923
},
54924
54924
"browser": {
54925
54925
"request": "browser-request"
@@ -54937,7 +54937,6 @@ module.exports={
54937
54937
"brfs": "^2.0.1",
54938
54938
"chai": "^4.2.0",
54939
54939
"gulp": "^4.0.0",
54940
- "karma-phantomjs-launcher": "^1.0.4",
54941
54940
"sinon": "^7.1.1"
54942
54941
},
54943
54942
"license": "MIT",
Original file line number Diff line number Diff line change 4
4
module . exports = function ( config ) {
5
5
6
6
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 ,
14
25
files : [
15
- '../../ tests.js'
26
+ 'tests.js'
16
27
] ,
17
28
plugins : [
18
29
'karma-mocha' ,
19
- 'karma-phantomjs-launcher' ,
20
30
'karma-chrome-launcher' ,
21
- ] ,
22
- browsers : [ 'PhantomJS' , 'Chrome' ]
31
+ 'karma-firefox-launcher' ,
32
+ 'karma-detect-browsers'
33
+ ]
34
+ browsers : [ 'Chrome' , 'Firefox' ]
23
35
} ) ;
24
36
25
37
} ;
Original file line number Diff line number Diff line change @@ -1041,7 +1041,7 @@ Transaction.prototype.sort = function() {
1041
1041
this . sortInputs ( function ( inputs ) {
1042
1042
var copy = Array . prototype . concat . apply ( [ ] , inputs ) ;
1043
1043
copy . sort ( function ( first , second ) {
1044
- return compare ( first . prevTxId , second . prevTxId )
1044
+ return compare ( first . prevTxId , second . prevTxId )
1045
1045
|| first . outputIndex - second . outputIndex ;
1046
1046
} ) ;
1047
1047
return copy ;
Original file line number Diff line number Diff line change 29
29
],
30
30
"repository" : {
31
31
"type" : " git" ,
32
- "url" : " https://github.com/bitpay/bitcore-lib.git "
32
+ "url" : " https://github.com/bitpay/bitcore/tree/master/packages/bitcore -lib"
33
33
},
34
34
"browser" : {
35
35
"request" : " browser-request"
47
47
"brfs" : " ^2.0.1" ,
48
48
"chai" : " ^4.2.0" ,
49
49
"gulp" : " ^4.0.0" ,
50
- "karma-phantomjs-launcher" : " ^1.0.4" ,
51
50
"sinon" : " ^7.1.1"
52
51
},
53
52
"license" : " MIT" ,
Original file line number Diff line number Diff line change @@ -1163,7 +1163,6 @@ describe('Transaction', function() {
1163
1163
return original . indexOf ( value ) ;
1164
1164
} ) ;
1165
1165
} ;
1166
-
1167
1166
fixture . inputs . forEach ( function ( inputSet ) {
1168
1167
it ( inputSet . description , function ( ) {
1169
1168
var tx = new Transaction ( ) ;
You can’t perform that action at this time.
0 commit comments