WIP: implement e2e test harness

caitp · caitp · commit 61d21436032a · 2014-10-15T13:58:24.000-04:00
This is a work in progress, still trying to make the server do everything it should do.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -4,6 +4,7 @@ var files = require('./angularFiles').files;
 var util = require('./lib/grunt/utils.js');
 var versionInfo = require('./lib/versions/version-info');
 var path = require('path');
+var e2e = require('./test/e2e/tools');
 
 module.exports = function(grunt) {
   //grunt plugins
@@ -50,6 +51,7 @@ module.exports = function(grunt) {
             return [
               util.conditionalCsp(),
               util.rewrite(),
+              e2e.middleware(),
               connect.favicon('images/favicon.ico'),
               connect.static(base),
               connect.directory(base)
@@ -75,6 +77,7 @@ module.exports = function(grunt) {
 
                 next();
               },
+              e2e.middleware(),
               util.conditionalCsp(),
               connect.favicon('images/favicon.ico'),
               connect.static(base)
diff --git a/test/e2e/templates/test.html b/test/e2e/templates/test.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+{% if eq(test.ngAppTag, "html") %}
+<html ng-app="{{ test.ngApp }}">
+{% else %}
+<html>
+{% endif %}
+    <head>
+        {% if scripts.jQuery %}
+        <script src="{{ scripts.jQuery }}"></script>
+        {% endif %}
+        {% for script in test.scripts %}
+            <script src="{{ test.scripts[script] }}"></script>
+        {% endfor %}
+        {{ test.head }}
+    </head>
+    {% if test.ngAppTag === "body" %}
+    <body ng-app="{{ test.ngApp }}">
+    {% else %}
+    <body>
+    {% endif %}
+    {% test.body %}
+    </body>
+</html>
diff --git a/test/e2e/tests/sample/index.html b/test/e2e/tests/sample/index.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<html ng-app="test">
+<p>Hello!</p>
+<script src="angular.js"></script>
+</html>
diff --git a/test/e2e/tests/sample/sample.json b/test/e2e/tests/sample/sample.json
@@ -0,0 +1,3 @@
+{
+  "good": true
+}
diff --git a/test/e2e/tools/fixture.js b/test/e2e/tools/fixture.js
@@ -0,0 +1,66 @@
+var fs = require('fs');
+var path = require('path');
+var $ = require('cheerio');
+
+var root = path.resolve(__dirname, '..');
+var tests = path.resolve(root, 'tests');
+
+var projectRoot = path.resolve(__dirname, '../../..');
+var build = path.resolve(projectRoot, 'build');
+
+function rewriteAngularSrc(src, query) {
+  if (query) {
+    if (query.build) {
+      return query.build + '/' + src;
+    } else if (query.cdn) {
+      return '//ajax.googleapis.com/ajax/libs/angularjs/' + query.cdn + '/' + src;
+    }
+  }
+  return '/build/' + src;
+}
+
+function generateFixture(test, query) {
+  var indexFile = path.resolve(tests, test, 'index.html');
+  var text = fs.readFileSync(indexFile, 'utf8');
+
+  var $$ = $.load(text);
+
+  var firstScript = null;
+  var jquery = null;
+  var angular = null;
+  $$('script').each(function(i, script) {
+    var src = $(script).attr('src');
+    if (src === 'jquery.js' && jquery === null) jquery = script;
+    else if (src === 'angular.js' && angular === null) angular = script;
+    if (firstScript === null) firstScript = script;
+    if (src) {
+      if (fs.statSync(path.resolve(build, src))) {
+        $(script).attr('src', rewriteAngularSrc(src, query));
+      }
+    }
+  });
+
+  if (jquery && (!('jquery' in query) || (/^(0|no|false|off|n)$/i).test(query.jquery))) {
+    $(jquery).remove();
+  } else if (query.jquery) {
+    if (!jquery) {
+      jquery = $.load('<script></script>')[0];
+      if (firstScript) {
+        $(firstScript).prepend(jquery);
+      } else {
+        $($$).first().before(jquery);
+      }
+    }
+    if (!/^\d+\.\d+.*$/.test(query.jquery)) {
+      $(jquery).attr('src', '/bower_components/jquery/dist/jquery.js');
+    } else {
+      $(jquery).attr('src', '//ajax.googleapis.com/ajax/libs/jquery/' + query.jquery + '/jquery.js');
+    }
+  }
+
+  return $$.html();
+}
+
+module.exports = {
+  generate: generateFixture
+};
diff --git a/test/e2e/tools/index.js b/test/e2e/tools/index.js
@@ -0,0 +1,3 @@
+module.exports = {
+  middleware: require('./middleware')
+};
diff --git a/test/e2e/tools/middleware.js b/test/e2e/tools/middleware.js
@@ -0,0 +1,30 @@
+var url = require('url');
+var util = require('./util');
+var fixture = require('./fixture');
+
+module.exports = middlewareFactory;
+
+function middlewareFactory(base) {
+  base = base || '/e2e';
+  while (base.length && base[base.length-1] === '/') base = base.slice(0, base.length-1);
+  var fixture_regexp = new RegExp('^' + base + '/tests/([a-zA-Z0-9_-]+)(/(index.html)?)?$');
+
+  return function(req, res, next) {
+    var match;
+    if (match = fixture_regexp.exec(req.url)) {
+      if (util.testExists(match[1])) {
+        try {
+          var query = url.parse(req.url, true).query;
+          res.write(fixture.generate(match[1], query));
+          res.end();
+        } catch (e) {
+          return next(e);
+        }
+      } else {
+        return next(new Error('Test ' + match[1] + ' not found.'));
+      }
+    } else {
+      return next();
+    }
+  }
+}
diff --git a/test/e2e/tools/util.js b/test/e2e/tools/util.js
@@ -0,0 +1,13 @@
+var fs = require('fs');
+var path = require('path');
+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();
+  }
+};

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = {`
	`2`	`+ middleware: require('./middleware')`
	`3`	`+};`