Merge f6c9909 into 8ba0494

.travis.yml

@@ -1,9 +1,9 @@
 language: node_js
 
 node_js:
-  - "6"
   - "8"
   - "10"
+  - "12"
 
 cache:
   directories:
@@ -12,6 +12,7 @@ cache:
 os:
   - osx
   - linux
+  - windows
 
 before_install:
   - node --version

appveyor.yml

@@ -1,8 +1,9 @@
 environment:
   matrix:
-  - nodejs_version: "6"
   - nodejs_version: "8"
   - nodejs_version: "10"
+  - nodejs_version: "12"
+
 
 cache:
   - '%APPDATA%\elm\0.19.0\package'
@@ -15,7 +16,7 @@ matrix:
 
 init:
   # report build worker details
-  #- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+  # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 install:
   # update node version
@@ -35,7 +36,7 @@ test_script:
 
 on_finish:
   # pause before completion when $blockRdp is true
-  #- ps: $blockRdp = $false;
+  # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
   # upload unit test results
   - ps: |

lib/analyzer.ts

@@ -291,7 +291,7 @@ export class AnalyzerImp implements Analyzer {
 
     const maxPathDepth = _.max(items.map(x => this.toPathDepth(x.moduleName)))!;
     const maxLabelLength = _.max(items.map(x => !x.moduleName ? 0 : x.moduleName.length))!;
-    const maxLineNumberLength = _.max(items.map(x => x.node.start.lineNumber))!;
+    const maxLineNumberLength = _.max(items.map(x => x.node.start.lineNumber.toString().length))!;
 
     return _.sortBy(items, (x: AnalyzedTestFunctionNode) => this.toSortKey(maxPathDepth, maxLabelLength, maxLineNumberLength, x));
   }
@@ -349,9 +349,10 @@ export class AnalyzerImp implements Analyzer {
       moduleName = this.util.padRight(item.moduleName, maxLabelLength);
     }
 
-    const location = this.util.padRight(item.node.start.lineNumber.toString(), maxLineNumberLength);
+    const location = _.padStart(item.node.start.lineNumber.toString(), maxLineNumberLength);
 
     return pathDepth + moduleName + location;
+
   }
 
   public toNameAndStartLocation(appDirectory: string, filePath: string, functionNode: AnalyzedTestFunctionNode): string {

test/unit/lib/analyzer.test.ts

@@ -1234,15 +1234,16 @@ describe("lib analyzer", () => {
         <AnalyzedTestFunctionNode> {moduleName: "bar", node: {start: {lineNumber: 123}}},
         <AnalyzedTestFunctionNode> {moduleName: "bar", node: {start: {lineNumber: 4}}}
       ];
+      mockUtil.padRight = _.padEnd;
 
       // act
       const actual = analyzerImp.sortItemsByLabel(items);
 
       // assert
       expect(actual.length).to.equal(3);
       expect(actual[0]).to.equal(items[2]);
-      expect(actual[1]).to.equal(items[1]);
-      expect(actual[2]).to.equal(items[0]);
+      expect(actual[1]).to.equal(items[0]);
+      expect(actual[2]).to.equal(items[1]);
     });
   });
 
@@ -1393,7 +1394,7 @@ describe("lib analyzer", () => {
       mockPadRight.returns("baz");
 
       // act
-      const actual = analyzerImp.toSortKey(12, 34, 56, functionNode);
+      const actual = analyzerImp.toSortKey(12, 34, 3, functionNode);
 
       // assert
       expect(actual).to.equal("78baz456");