fixed some problems in client tests

rethinkdb · Tryneus · Aug 11, 2016 · Aug 12, 2016 · Aug 12, 2016 · Aug 12, 2016
commit 2430c8a19516804a48d08d7dba0bb775903b554d
diff --git a/client/src/ast.js b/client/src/ast.js
@@ -8,16 +8,16 @@ export class TermBase {
   }
 }
 
-export function addOption(name, isTerminal) {
-  if (isTerminal) {
+export function addOption(name, type) {
+  if (type === 'terminal') {
     TermBase.prototype[name] = function (...args) {
       const newOptions = Object.assign({[name]: args}, this[optionsSymbol])
-      return new TermBase(newOptions, this[sendSymbol])
+      return this[sendSymbol](newOptions)
     }
   } else {
     TermBase.prototype[name] = function (...args) {
       const newOptions = Object.assign({[name]: args}, this[optionsSymbol])
-      return this[sendSymbol](newOptions)
+      return new TermBase(newOptions, this[sendSymbol])
     }
   }
 }

diff --git a/client/src/socket.js b/client/src/socket.js
@@ -86,7 +86,7 @@ export class HorizonSocket extends WebSocketSubject {
 
     this.keepalive = Observable
       .timer(keepalive * 1000, keepalive * 1000)
-      .map(n => this.makeRequest({ type: 'keepalive' }).subscribe())
+      .map(n => this.makeRequest(null, 'keepalive').subscribe())
       .publish()
 
     // This is used to emit status changes that others can hook into.
@@ -151,7 +151,8 @@ export class HorizonSocket extends WebSocketSubject {
   // * Send `end_subscription` when observable is unsubscribed
   makeRequest(options, type) {
     const requestId = this.requestCounter++
-    const req = {message: {requestId, options}, data: {}}
+    const req = {message: {requestId}, data: {}}
+    if (options) { req.message.options = options }
     if (type) { req.message.type = type }
 
     return super.multiplex(
@@ -174,9 +175,9 @@ export class HorizonSocket extends WebSocketSubject {
   // * Completes when `state: complete` is received
   // * Reference counts subscriptions
   hzRequest(options) {
-    const end = AsyncSubject()
+    const end = new AsyncSubject()
     return this.sendHandshake().ignoreElements()
-      .concat(this.makeRequest(rawRequest))
+      .concat(this.makeRequest(options))
       .concatMap((response) => {
         if (response.error) {
           throw new Error(response.error)

diff --git a/client/test/test.html b/client/test/test.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <link href="mocha.css" rel="stylesheet"/>
-  <script src="horizon.js"></script>
+  <script src="/horizon/horizon.js"></script>
 </head>
 <body>
 

diff --git a/server/src/server.js b/server/src/server.js
@@ -35,6 +35,16 @@ const clientSourceMap = lazyLoadSource(`${clientSourcePath}.map`);
 const clientSourceCore = lazyLoadSource(clientSourceCorePath);
 const clientSourceCoreMap = lazyLoadSource(`${clientSourceCorePath}.map`);
 
+function makeCapabilitiesCode(capabilities) {
+  return `
+;{
+  let capabilities = ${JSON.stringify(capabilities)};
+  Object.keys(capabilities).forEach(function (key) {
+    Horizon.addOption(key, capabilities[key].type);
+  });
+};`;
+}
+
 class Server {
   constructor(httpServers, options) {
     this.events = new EventEmitter();
@@ -263,21 +273,15 @@ class Server {
     if (!this._capabilities) {
       this._capabilities = {};
       for (const key in this._methods) {
-        this._capabilities[key] = {type: this._methods[key]};
+        this._capabilities[key] = {type: this._methods[key].type};
       }
     }
     return this._capabilities;
   }
 
   applyCapabilitiesCode() {
     if (!this._applyCapabilitiesCode) {
-      this._applyCapabilitiesCode =
-        `;{
-           let capabilities = ${JSON.stringify(this.capabilities())};
-           Object.keys(capabilities).forEach(function (key) {
-             Horizon.addOption(key, capabilities[key].type);
-           });
-         };`;
+      this._applyCapabilitiesCode = makeCapabilitiesCode(this.capabilities());
     }
     return this._applyCapabilitiesCode;
   }

diff --git a/test/src/serve.js b/test/src/serve.js
@@ -26,8 +26,8 @@ const crypto = require('crypto');
 const argparse = require('argparse');
 
 const dataDir = path.resolve(__dirname, 'rethinkdb_data_test');
-const testDistDir = path.resolve(__dirname, '../../client/dist');
-const examplesDir = path.resolve(__dirname, '../../examples');
+const rootDir = path.resolve(__dirname, '../..');
+const clientDistDir = path.resolve(rootDir, 'client/dist');
 
 const parser = new argparse.ArgumentParser();
 parser.addArgument(['--port', '-p'],
@@ -53,37 +53,41 @@ if (options.bind.indexOf('all') !== -1) { options.bind = ['0.0.0.0']; }
 process.on('SIGINT', () => process.exit(0));
 process.on('SIGTERM', () => process.exit(0));
 
-const serveFile = (filePath, res) => {
-  fs.access(filePath, fs.R_OK | fs.F_OK, (exists) => {
-    if (exists) {
-      res.writeHead(404, {'Content-Type': 'text/plain'});
-      res.end(`File "${filePath}" not found\n`);
+function readFile(filePath) {
+  return new Promise((resolve, reject) =>
+    fs.access(filePath, fs.R_OK | fs.F_OK, (exists) => {
+      if (exists) {
+        reject(new Error(`File "${filePath}" not found.`));
+      } else {
+        fs.readFile(filePath, 'binary',
+          (err, file) => (err ? reject(err) : resolve(file)));
+      }
+    })
+  );
+}
+
+function serveFile(filePath, res) {
+  console.log(`serving file ${filePath}`);
+  readFile(filePath).then((data) => {
+    if (filePath.endsWith('.js')) {
+      res.writeHead(200, {'Content-Type': 'application/javascript'});
+    } else if (filePath.endsWith('.html')) {
+      res.writeHead(200, {'Content-Type': 'text/html'});
     } else {
-      fs.readFile(filePath, 'binary', (err, file) => {
-        if (err) {
-          res.writeHead(500, {'Content-Type': 'text/plain'});
-          res.end(`${err}\n`);
-        } else {
-          if (filePath.endsWith('.js')) {
-            res.writeHead(200, {'Content-Type': 'application/javascript'});
-          } else if (filePath.endsWith('.html')) {
-            res.writeHead(200, {'Content-Type': 'text/html'});
-          } else {
-            res.writeHead(200);
-          }
-          res.end(file, 'binary');
-        }
-      });
+      res.writeHead(200);
     }
+    res.end(data, 'binary');
+  }).catch((err) => {
+    res.writeHead(404, {'Content-Type': 'text/plain'});
+    res.end(`${err}\n`);
   });
 };
 
 // On Windows, `npm` is actually `npm.cmd`
 const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
 
 // Run the client build
-const buildProc = child_process.spawn(npmCmd, ['run', 'dev'],
-                                      {cwd: testDistDir});
+const buildProc = child_process.spawn(npmCmd, ['run', 'dev'], {cwd: clientDistDir});
 
 buildProc.on('exit', () => process.exit(1));
 process.on('exit', () => buildProc.kill('SIGTERM'));
@@ -118,18 +122,13 @@ buildProc.stderr.on('data', (data) => {
 // Launch HTTP server with horizon that will serve the test files
 const httpServers = options.bind.map((host) =>
   new http.Server((req, res) => {
-    const reqPath = url.parse(req.url).pathname;
-    if (reqPath.indexOf('/examples/') === 0) {
-      serveFile(path.resolve(examplesDir,
-                             reqPath.replace(/^[/]examples[/]/, '')), res);
+    const reqPath = url.parse(req.url).pathname.replace(/^\//, '');
+    console.log(`request with path ${reqPath}`);
+    if (reqPath === 'test' || reqPath === 'test/') {
+      res.writeHead(302, {Location: '/client/dist/test.html'});
+      res.end();
     } else {
-      if (!clientReady) {
-        res.writeHead(503, {'Content-Type': 'text/plain'});
-        res.end('Initial client build is ongoing, try again in a few seconds.');
-      } else {
-        serveFile(path.resolve(testDistDir,
-                               reqPath.replace(/^[/]/, '')), res);
-      }
+      serveFile(path.resolve(rootDir, reqPath), res);
     }
   }));
 
@@ -195,9 +194,23 @@ Promise.all(
       serv.removeAllListeners('request');
       serv.on('request', (req, res) => {
         const reqPath = url.parse(req.url).pathname;
-        if (reqPath === '/horizon/horizon.js' ||
-            reqPath === '/horizon/horizon.js.map') {
-          serveFile(path.resolve(testDistDir, reqPath.replace('/horizon/', '')), res);
+        console.log(`Serving path ${reqPath}`);
+        if (reqPath.match(/^\/horizon\/[^\/]+\.js$/)) {
+          console.log(`Serving modified code`);
+          if (!clientReady) {
+            res.writeHead(503, {'Content-Type': 'text/plain'});
+            res.end('Initial client build is ongoing, try again in a few seconds.\n');
+          } else {
+            readFile(path.resolve(clientDistDir, reqPath.replace('/horizon/', ''))).then((data) => {
+              res.writeHead(200, {'Content-Type': 'application/javascript'});
+              res.end(data + hzRouter.server.applyCapabilitiesCode(), 'binary');
+            }).catch((err) => {
+              res.writeHead(404, {'Content-Type': 'text/plain'});
+              res.end(`${err}\n`);
+            });
+          }
+        } else if (reqPath.match(/^\/horizon\/[^\/]+\.js\.map$/)) {
+          serveFile(path.resolve(clientDistDir, reqPath.replace('/horizon/', '')), res);
         } else {
           extantListeners.forEach((l) => l.call(serv, req, res));
         }