Merge pull request #18 from smikes/manual-merge

Manual merge
smikes · Mar 14, 2019 · bbcddc9 · bbcddc9
2 parents 703a5aa + ed066fa
commit bbcddc9
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 39 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "test262-parser",
-  "version": "2.0.7",
+  "version": "2.0.10",
   "description": "Parse a test262-format test and provide API",
   "main": "lib/parser.js",
   "scripts": {
@@ -23,7 +23,8 @@
   ],
   "author": "Brian Terlson",
   "contributors": [
-    "Sam Mikes"
+    "Sam Mikes",
+    "Adrian Heine"
   ],
   "license": "MSFT MIT-like",
   "directories": [

diff --git a/test/simple.js b/test/simple.js
@@ -134,7 +134,7 @@ describe('works on non-formatted files', function () {
     });
 
     it('does not fail if no newline at end of file', function () {
-        var file = parser.parseFile(fixtures.no_newline);
+        parser.parseFile(fixtures.no_newline);
     });
 });
 
@@ -145,7 +145,7 @@ describe('works with test content preceeding the frontmatter', function () {
     });
 });
 
-describe('reports valid test262 file', function() {
+describe('reports valid test262 file', function () {
     it('in S72', function () {
         var file = parser.parseFile(fixtures.S72);
         assert(file.isATest);
@@ -163,44 +163,44 @@ describe('reports valid test262 file', function() {
 });
 
 describe('reports non-test262 file', function () {
-  it('detects a non-test262 file', function () {
-    var file = parser.parseFile(fixtures.issue_9);
+    it('detects a non-test262 file', function () {
+        var file = parser.parseFile(fixtures.issue_9);
 
-    assert(!file.isATest)
-  });
+        assert(!file.isATest);
+    });
 });
 
 describe('has a stream interface', function () {
-// should be last test: ends stream (not repeatable)
-it('provides a stream interface', function (done) {
-    var counts = {
-        processed: 0,
-        error: 0
-    };
-
-    parser.on('data', function (f) {
-        assert.equal(f.file, 'S72');
-        assert.equal(f.attrs.es5id, '7.2_A1.1_T1');
-        counts.processed += 1;
+    // should be last test: ends stream (not repeatable)
+    it('provides a stream interface', function (done) {
+        var counts = {
+            processed: 0,
+            error: 0
+        };
+
+        parser.on('data', function (f) {
+            assert.equal(f.file, 'S72');
+            assert.equal(f.attrs.es5id, '7.2_A1.1_T1');
+            counts.processed += 1;
+        });
+        parser.on('error', function (e) {
+            assert.ok(/YAML/.test(e));
+            counts.error += 1;
+        });
+        parser.on('end', function () {
+            assert.equal(counts.processed, 1);
+            assert.equal(counts.error, 1);
+            done();
+        });
+
+        parser.write({
+            file: 'S72',
+            contents: fixtures.S72
+        });
+        parser.write({
+            file: 'badYAML.js',
+            contents: fixtures.badYAML
+        });
+        parser.end();
     });
-    parser.on('error', function (e) {
-        assert.ok(/YAML/.test(e));
-        counts.error += 1;
-    });
-    parser.on('end', function () {
-        assert.equal(counts.processed, 1);
-        assert.equal(counts.error, 1);
-        done();
-    });
-
-    parser.write({
-        file: 'S72',
-        contents: fixtures.S72
-    });
-    parser.write({
-        file: 'badYAML.js',
-        contents: fixtures.badYAML
-    });
-    parser.end();
-});
 });