Added "external" option support

LearnBoost · Dec 10, 2010 · 2f1fdaf · 2f1fdaf
1 parent 4b27762
commit 2f1fdaf
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/lib/browser.js b/lib/browser.js
@@ -25,11 +25,18 @@ var port = 8888;
 /**
  * Initialize a new `Browser` with the given `html` or `server`.
  *
+ * Options:
+ *
+ *    - `external`   enable fetching and evaluation of external resources [false]
+ *
  * @param {String|http.Server} html
+ * @param {Object} options
  * @api public
  */
 
-var Browser = module.exports = exports = function Browser(html) {
+var Browser = module.exports = exports = function Browser(html, options) {
+  options = options || {};
+  this.external = options.external;
   this.history = [];
   this.cookieJar = new CookieJar;
   if ('string' == typeof html) {
@@ -59,8 +66,12 @@ Browser.prototype.__proto__ = EventEmitter.prototype;
  */
 
 Browser.prototype.parse = function(html){
+  var options = {};
+  if (this.external) {
+    options.features = { FetchExternalResources: false, ProcessExternalResources: false };
+  }
   this.source = html;
-  this.window = jsdom.jsdom(wrap(html)).createWindow();
+  this.window = jsdom.jsdom(wrap(html), null, options).createWindow();
   this.jQuery = jQuery.create(this.window);
   this.jQuery.browser = this.jQuery.fn.browser = this;
   require('./jquery')(this, this.jQuery);

diff --git a/test/browser.navigation.test.js b/test/browser.navigation.test.js
@@ -75,6 +75,10 @@ app.get('/search/results', function(req, res){
   res.send(req.query);
 });
 
+app.get('/script', function(req, res, next){
+  res.send('<script>document.getElementById("para").innerHTML = "<em>new</em>";</script><p id="para">old</p>');
+});
+
 app.get('/form', function(req, res){
   res.send('<form id="user" method="post">'
     + '<input id="user-name" type="text" name="user[name]" />'
@@ -100,6 +104,24 @@ app.post('/form', function(req, res){
 });
 
 module.exports = {
+  'test external option disabled': function(done){
+    var browser = tobi.createBrowser(app);
+    browser.get('/script', function(res, $){
+      res.should.have.status(200);
+      $('p').should.have.text('old');
+      done();
+    });
+  },
+
+  'test external option enabled': function(done){
+    var browser = tobi.createBrowser(app, { external: true });
+    browser.get('/script', function(res, $){
+      res.should.have.status(200);
+      $('p').should.have.text('new');
+      done();
+    });
+  },
+
   'test .request() invalid response': function(done){
     var browser = tobi.createBrowser(app);
     browser.on('error', function(err){