Merge pull request azer#2 from nlacasse/frame-with-queryparams

Frame with queryparams
aghassemi · Oct 31, 2014 · 8e35ff9 · 8e35ff9
2 parents 657522a + 0afb020
commit 8e35ff9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/browser.js b/lib/browser.js
@@ -14,6 +14,7 @@ var prettifyError = require("prettify-error");
 var WebSocket = require("faye-websocket");
 var mime = require("mime");
 var execFirst = require("./exec-first");
+var url = require('url');
 
 var nodeTemplate = require("./node-template");
 var nodeReporter = require("./node-reporter");
@@ -59,8 +60,9 @@ function start (files, command) {
   read.on('update', onSourceCodeChange.publish);
 
   if (command.frame) {
-    customFrameURL = path.join('/assets/in', command.frame);
-    routes[customFrameURL] = customFrame(command.frame);
+    var framePathname = url.parse(command.frame).pathname;
+    customFrameURL = path.join('/assets/in', framePathname);
+    routes[customFrameURL] = customFrame(framePathname);
   }
 
   routes['/assets/in/:filename([\\w\\.\\/-]+)'] = localAsset;
@@ -296,5 +298,5 @@ function customFrame (filename) {
 }
 
 function setContentType (req, res) {
-  res.setHeader('Content-Type', mime.lookup(req.url));
+  res.setHeader('Content-Type', mime.lookup(url.parse(req.url).pathname));
 }
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "prova": "./bin/prova"
   },
   "scripts": {
-    "test": "node test.js"
+    "test": "prova test/*"
   },
   "dependencies": {
     "new-command": "0.0.3",