WIP: move fixtures into fixtures directory

Author: caitp

test/e2e/tests/sample/index.html renamed to test/e2e/fixtures/sample/index.html

@@ -6,7 +6,7 @@ var $ = require('cheerio');
 var util = require('./util');
 
 var root = path.resolve(__dirname, '..');
-var tests = path.resolve(root, 'tests');
+var fixtures = path.resolve(root, 'fixtures');
 
 var projectRoot = path.resolve(__dirname, '../../..');
 var build = path.resolve(projectRoot, 'build');
@@ -23,7 +23,7 @@ function rewriteAngularSrc(src, query) {
 }
 
 function generateFixture(test, query) {
-  var indexFile = path.resolve(tests, test, 'index.html');
+  var indexFile = path.resolve(fixtures, test, 'index.html');
   var text = fs.readFileSync(indexFile, 'utf8');
 
   var $$ = $.load(text);

test/e2e/tests/sample/script.js renamed to test/e2e/fixtures/sample/script.js

@@ -9,8 +9,8 @@ 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)?)?$');
-  var static_regexp = new RegExp('^' + base + '/tests/([a-zA-Z0-9_-]+)(/.*)$');
+  var fixture_regexp = new RegExp('^' + base + '/fixtures/([a-zA-Z0-9_-]+)(/(index.html)?)?$');
+  var static_regexp = new RegExp('^' + base + '/fixtures/([a-zA-Z0-9_-]+)(/.*)$');
 
   return function(req, res, next) {
     var match;
@@ -29,7 +29,7 @@ function middlewareFactory(base) {
           return next(e);
         }
       } else {
-        return next('Test ' + match[1] + ' not found.');
+        return next('Fixture ' + match[1] + ' not found.');
       }
     } else if ((match = static_regexp.exec(basicUrl))) {
       var rewritten = util.rewriteTestFile(match[1], match[2]);

test/e2e/tools/fixture.js

@@ -5,7 +5,7 @@ var path = require('path');
 var url = require('url');
 
 var root = path.resolve(__dirname, '..');
-var tests = path.resolve(root, 'tests');
+var tests = path.resolve(root, 'fixtures');
 
 function stat(path) {
   try {
@@ -29,7 +29,7 @@ function rewriteTestFile(testname, testfile) {
   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 ['/test/e2e/fixtures', testname, testfile].join('/');
   }
   return false;
 }