WIP: statSync can throw.

angular · caitp · Oct 10, 2014 · Oct 15, 2014 · Oct 15, 2014 · Oct 15, 2014
commit d71f56d23db99e5454f28edb30bc255e92d131fb
diff --git a/test/e2e/tests/sample/index.html b/test/e2e/tests/sample/index.html
@@ -1,5 +1,9 @@
 <!DOCTYPE html>
 <html ng-app="test">
-<p>Hello!</p>
+<div ng-controller="TestCtrl">
+    <p>{{text}}</p>
+</div>
+
 <script src="angular.js"></script>
+<script src="script.js"></script>
 </html>
diff --git a/test/e2e/tests/sample/sample.json b/test/e2e/tests/sample/sample.json
diff --git a/test/e2e/tests/sample/script.js b/test/e2e/tests/sample/script.js
@@ -0,0 +1,4 @@
+angular.module("test", []).
+  controller("TestCtrl", function($scope) {
+    $scope.text = "Hello, world!";
+  });
diff --git a/test/e2e/tools/fixture.js b/test/e2e/tools/fixture.js
@@ -3,6 +3,7 @@
 var fs = require('fs');
 var path = require('path');
 var $ = require('cheerio');
+var util = require('./util');
 
 var root = path.resolve(__dirname, '..');
 var tests = path.resolve(root, 'tests');
@@ -36,7 +37,8 @@ function generateFixture(test, query) {
     else if (src === 'angular.js' && angular === null) angular = script;
     if (firstScript === null) firstScript = script;
     if (src) {
-      if (fs.statSync(path.resolve(build, src))) {
+      var s = util.stat(path.resolve(build, src));
+      if (s && s.isFile()) {
         $(script).attr('src', rewriteAngularSrc(src, query));
       }
     }

diff --git a/test/e2e/tools/util.js b/test/e2e/tools/util.js
@@ -7,20 +7,35 @@ var url = require('url');
 var root = path.resolve(__dirname, '..');
 var tests = path.resolve(root, 'tests');
 
-module.exports = {
-  testExists: function(testname) {
-    testname = path.resolve(tests, testname);
-    return fs.statSync(testname).isDirectory();
-  },
-
-  rewriteTestFile: function(testname, testfile) {
-    var i = 0;
-    while (testfile[i] === '/') ++i;
-    testfile = testfile.slice(i);
-    var stat = fs.statSync(path.resolve(tests, testname, testfile));
-    if (stat && stat.isFile() || stat.isDirectory()) {
-      return ['/test/e2e/tests', testname, testfile].join('/');
+function stat(path) {
+  try {
+    return fs.statSync(path);
+  } catch (e) {
+    // Ignore ENOENT.
+    if (e.code !== 'ENOENT') {
+      throw e;
     }
-    return false;
   }
+}
+
+function testExists(testname) {
+  var s = stat(path.resolve(tests, testname));
+  return s && s.isDirectory();
+}
+
+function rewriteTestFile(testname, testfile) {
+  var i = 0;
+  while (testfile[i] === '/') ++i;
+  testfile = testfile.slice(i);
+  var s = stat(path.resolve(tests, testname, testfile));
+  if (s && s.isFile() || s.isDirectory()) {
+    return ['/test/e2e/tests', testname, testfile].join('/');
+  }
+  return false;
+}
+
+module.exports = {
+  stat: stat,
+  testExists: testExists,
+  rewriteTestFile: rewriteTestFile
 };