Changeset 19:ab5f65372038 in pyenvjasmine

Timestamp:

Apr 24, 2015, 1:03:31 PM (9 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

Imported latest envjasmine version, the initial import from darcs had the wrong version

Location:

pyenvjasmine/envjasmine

Files:

• EnvJasmine.gemspec (added)
• README.textile (modified) (1 diff)
• bin/envjs_run_coverage (added)
• bin/envjs_run_test (added)
• bin/run_coverage.sh (added)
• include/dependencies.js (modified) (2 diffs)
• lib/envjasmine.js (modified) (8 diffs)
• lib/jasmine-jquery/jasmine-jquery-1.2.0.js (deleted)
• lib/jasmine-jquery/jasmine-jquery-master.js (added)
• lib/jasmine-jquery/jasmine-jquery.js (modified) (1 diff)
• lib/jscover/JSCover-all.jar (added)
• lib/jscover/README.textile (added)
• lib/jscover/envjasmine-coverage.js (added)
• lib/jscover/envjasmine-sonar-coverage-helper.js (added)
• lib/jscover/envjasmine-sonar-coverage-properties.js (added)
• lib/jscover/envjasmine-sonar-coverage-runner.js (added)
• samples/ajaxDemo.js (modified) (1 diff)
• samples/callbackDemo.js (added)
• samples/demo.js (modified) (1 diff)
• samples/notCoveredDemo.js (added)
• sonar-project.properties (added)
• sonar.js.xml (added)
• specs/ajaxDemo.spec.js (modified) (1 diff)
• specs/callbackDemo.spec.js (added)
• specs/demo.spec.js (modified) (1 diff)
• specs/notCoveredDemo.spec.js (added)

pyenvjasmine/envjasmine/README.textile

@@ -156 +156 @@
 bc. ./tests/EnvJasmine/bin/run_test.sh --configFile=</absolute/path/to/demo/tests/EnvJasmine/etc/conf/demo.conf.js> specs/add-numbers.spec.js
 
+
+h2. Code Coverage
+
+See @lib/jscover/README.textile@
+
+
+h2. EnvJasmine as a Ruby gem
+
+EnvJasmine can also be compiled to a Ruby gem.
+
+h3. How to build and install the EnvJasmine gem
+
+    git clone git://github.com/trevmex/EnvJasmine.git
+    cd EnvJasmine
+    gem build EnvJasmine.gemspec
+    gem install EnvJasmine-1.7.1.gem
+
+h3. Using the EnvJasmine Ruby gem
+
+Note that, when used as a Ruby gem, EnvJasmine requires a few command line arguments be specified.
+
+Here is a Ruby usage example:
+
+    envjs_run_test --configFile='some_spec_helper.js' --testDir='specs' --rootDir='some_project'
+
 That's it! For more help on Jasmine docs at https://github.com/pivotal/jasmine/wiki
 
 Please contact Trevor Lalish-Menagh through github (https://github.com/trevmex) with any defects or feature requests!
+

pyenvjasmine/envjasmine/include/dependencies.js

@@ -2 +2 @@
 //
 // NOTE: Load order does matter.
-
 // Load the envjasmine environment
 EnvJasmine.loadGlobal(EnvJasmine.libDir + "envjs/env.rhino.1.2.js");
@@ -12 +11 @@
 
 // This is your main JavaScript directory in your project.
-EnvJasmine.jsDir = EnvJasmine.rootDir + "/samples/"; // TODO: Change this to your project's main js directory.
+EnvJasmine.jsDir = EnvJasmine.jsDir || EnvJasmine.rootDir + "/samples/"; // TODO: Change this to your project's main js directory.
 
 EnvJasmine.loadGlobal(EnvJasmine.includeDir + "jquery-1.4.4.js"); // for example, load jquery.
 // TODO: Add your own
+
+
+// this will include the code coverage plugin
+//EnvJasmine.loadGlobal(EnvJasmine.libDir + "/jscover/envjasmine-sonar-coverage-properties.js"); // TODO: Uncomment and update if you want code coverage
+//EnvJasmine.loadGlobal(EnvJasmine.coverage.envjasmine_coverage_js); // TODO: Uncomment if you want code coverage

pyenvjasmine/envjasmine/lib/envjasmine.js

@@ -40 +40 @@
 };
 
+EnvJasmine.printDebug = function(str) {
+    if (EnvJasmine.debug) {
+        print(str);
+    }
+}
+
 EnvJasmine.normalizePath = function(path) {
     var endsInSlash = (path.slice(-1) == "/");
@@ -59 +65 @@
             EnvJasmine.cx.evaluateReader(scope, fileIn, normalizedPath, 0, null);
         } catch (e) {
+            print (e);
             print('Could not read file: ' + normalizedPath );
         } finally {
@@ -88 +95 @@
 };
 
+EnvJasmine.setJsDir = function(jsDir) {
+    EnvJasmine.jsDir = jsDir;
+};
+
 // Process command line options
-
 (function(argumentList) {
     var arg, nameValue, spec = "", specLoc;
@@ -97 +107 @@
     EnvJasmine.failedCount = 0;
     EnvJasmine.totalCount = 0;
-
     for (var i = 0; i < argumentList.length; i++) {
         arg = argumentList[i];
-
         if (arg.slice(0, 2) == "--") {
             nameValue = arg.slice(2).split('=');
-
             switch(nameValue[0]) {
                 case "testDir":
@@ -112 +119 @@
                     EnvJasmine.setTestDir(nameValue[1]); // Set the root as the default testDir.
                     break;
+                case "jsDir":
+                    EnvJasmine.setJsDir(nameValue[1]);
+                    break;
                 case "environment":
                     EnvJasmine.environment = nameValue[1];
@@ -129 +139 @@
                 case "customSpecsDir":
                     EnvJasmine.customSpecsDir = nameValue[1];
+                    break;
+                case "plugin":
+                    EnvJasmine.addPlugin(nameValue[1]);
+                    break;
+                case "debug":
+                    EnvJasmine.debug = true;
                     break;
                 case "help":
@@ -196 +212 @@
 EnvJasmine.results = [];
 
+EnvJasmine.addFinallyFunction = function(f) {
+    EnvJasmine.finallyFunctions.push(f);
+};
+EnvJasmine.finallyFunctions = [];
+
+
 EnvJasmine.loadConfig = function () {
     EnvJasmine.loadGlobal(EnvJasmine.configFile);
 };
 
+EnvJasmine.plugins = [];
+EnvJasmine.addPlugin = function(path) {
+    EnvJasmine.plugins.push(path);
+};
+
 (function() {
     var i, fileIn, len;
 
     EnvJasmine.loadConfig();
-    
+
+    for (i = 0; i < EnvJasmine.plugins.length; i++) {
+        EnvJasmine.loadGlobal(EnvJasmine.plugins[i]);
+    }
+
     if (typeof EnvJasmine.reporterClass === "undefined") {
         // Use the standard reporter
         EnvJasmine.reporterClass = RhinoReporter;
     }
-    
+
 
     jasmine.getEnv().addReporter(new EnvJasmine.reporterClass());
@@ -242 +273 @@
             EnvJasmine.cx.evaluateString(EnvJasmine.currentScope, 'window.location.assign(["file://", EnvJasmine.libDir, "envjasmine.html"].join(EnvJasmine.SEPARATOR));', 'Executing '+EnvJasmine.specs[i], 0, null);
         }
+        catch (e) {
+            print("Problem opening " + EnvJasmine.specFile + ": " + e);
+        }
         finally {
-            fileIn.close();
-        }
+            if(fileIn) {
+                fileIn.close();
+            }
+        }
+    }
+
+    for (i = 0; i < EnvJasmine.finallyFunctions.length; i++) {
+        EnvJasmine.finallyFunctions[i]();
     }
 

pyenvjasmine/envjasmine/lib/jasmine-jquery/jasmine-jquery.js

@@ -1 +1 @@
 var readFixtures = function() {
-  return jasmine.getFixtures().proxyCallTo_('read', arguments);
-};
+  return jasmine.getFixtures().proxyCallTo_('read', arguments)
+}
 
 var preloadFixtures = function() {
-  jasmine.getFixtures().proxyCallTo_('preload', arguments);
-};
+  jasmine.getFixtures().proxyCallTo_('preload', arguments)
+}
 
 var loadFixtures = function() {
-  jasmine.getFixtures().proxyCallTo_('load', arguments);
-};
+  jasmine.getFixtures().proxyCallTo_('load', arguments)
+}
+
+var appendLoadFixtures = function() {
+  jasmine.getFixtures().proxyCallTo_('appendLoad', arguments)
+}
 
 var setFixtures = function(html) {
-  jasmine.getFixtures().set(html);
-};
+  jasmine.getFixtures().proxyCallTo_('set', arguments)
+}
+
+var appendSetFixtures = function() {
+  jasmine.getFixtures().proxyCallTo_('appendSet', arguments)
+}
 
 var sandbox = function(attributes) {
-  return jasmine.getFixtures().sandbox(attributes);
-};
+  return jasmine.getFixtures().sandbox(attributes)
+}
 
 var spyOnEvent = function(selector, eventName) {
-  jasmine.JQuery.events.spyOn(selector, eventName);
+  return jasmine.JQuery.events.spyOn(selector, eventName)
+}
+
+var preloadStyleFixtures = function() {
+  jasmine.getStyleFixtures().proxyCallTo_('preload', arguments)
+}
+
+var loadStyleFixtures = function() {
+  jasmine.getStyleFixtures().proxyCallTo_('load', arguments)
+}
+
+var appendLoadStyleFixtures = function() {
+  jasmine.getStyleFixtures().proxyCallTo_('appendLoad', arguments)
+}
+
+var setStyleFixtures = function(html) {
+  jasmine.getStyleFixtures().proxyCallTo_('set', arguments)
+}
+
+var appendSetStyleFixtures = function(html) {
+  jasmine.getStyleFixtures().proxyCallTo_('appendSet', arguments)
+}
+
+var loadJSONFixtures = function() {
+  return jasmine.getJSONFixtures().proxyCallTo_('load', arguments)
+}
+
+var getJSONFixture = function(url) {
+  return jasmine.getJSONFixtures().proxyCallTo_('read', arguments)[url]
+}
+
+jasmine.spiedEventsKey = function (selector, eventName) {
+  return [$(selector).selector, eventName].toString()
 }
 
 jasmine.getFixtures = function() {
-  return jasmine.currentFixtures_ = jasmine.currentFixtures_ || new jasmine.Fixtures();
-};
+  return jasmine.currentFixtures_ = jasmine.currentFixtures_ || new jasmine.Fixtures()
+}
+
+jasmine.getStyleFixtures = function() {
+  return jasmine.currentStyleFixtures_ = jasmine.currentStyleFixtures_ || new jasmine.StyleFixtures()
+}
 
 jasmine.Fixtures = function() {
-  this.containerId = 'jasmine-fixtures';
-  this.fixturesCache_ = {};
-  this.fixturesPath = 'spec/javascripts/fixtures';
-};
+  this.containerId = 'jasmine-fixtures'
+  this.fixturesCache_ = {}
+  this.fixturesPath = 'spec/javascripts/fixtures'
+}
 
 jasmine.Fixtures.prototype.set = function(html) {
-  this.cleanUp();
-  this.createContainer_(html);
-};
+  this.cleanUp()
+  this.createContainer_(html)
+}
+
+jasmine.Fixtures.prototype.appendSet= function(html) {
+  this.addToContainer_(html)
+}
 
 jasmine.Fixtures.prototype.preload = function() {
-  this.read.apply(this, arguments);
-};
+  this.read.apply(this, arguments)
+}
 
 jasmine.Fixtures.prototype.load = function() {
-  this.cleanUp();
-  this.createContainer_(this.read.apply(this, arguments));
-};
+  this.cleanUp()
+  this.createContainer_(this.read.apply(this, arguments))
+}
+
+jasmine.Fixtures.prototype.appendLoad = function() {
+  this.addToContainer_(this.read.apply(this, arguments))
+}
 
 jasmine.Fixtures.prototype.read = function() {
-  var htmlChunks = [];
-
-  var fixtureUrls = arguments;
+  var htmlChunks = []
+
+  var fixtureUrls = arguments
   for(var urlCount = fixtureUrls.length, urlIndex = 0; urlIndex < urlCount; urlIndex++) {
-    htmlChunks.push(this.getFixtureHtml_(fixtureUrls[urlIndex]));
-  }
-
-  return htmlChunks.join('');
-};
+    htmlChunks.push(this.getFixtureHtml_(fixtureUrls[urlIndex]))
+  }
+
+  return htmlChunks.join('')
+}
 
 jasmine.Fixtures.prototype.clearCache = function() {
-  this.fixturesCache_ = {};
-};
+  this.fixturesCache_ = {}
+}
 
 jasmine.Fixtures.prototype.cleanUp = function() {
-  jQuery('#' + this.containerId).remove();
-};
+  $('#' + this.containerId).remove()
+}
 
 jasmine.Fixtures.prototype.sandbox = function(attributes) {
-  var attributesToSet = attributes || {};
-  return jQuery('<div id="sandbox" />').attr(attributesToSet);
-};
+  var attributesToSet = attributes || {}
+  return $('<div id="sandbox" />').attr(attributesToSet)
+}
 
 jasmine.Fixtures.prototype.createContainer_ = function(html) {
-  var container;
-  if(html instanceof jQuery) {
-    container = jQuery('<div id="' + this.containerId + '" />');
-    container.html(html);
+  var container
+  if(html instanceof $) {
+    container = $('<div id="' + this.containerId + '" />')
+    container.html(html)
   } else {
     container = '<div id="' + this.containerId + '">' + html + '</div>'
   }
-  jQuery('body').append(container);
-};
-
-jasmine.Fixtures.prototype.getFixtureHtml_ = function(url) {  
-  if (typeof this.fixturesCache_[url] == 'undefined') {
-    this.loadFixtureIntoCache_(url);
-  }
-  return this.fixturesCache_[url];
-};
+  $(document.body).append(container)
+}
+
+jasmine.Fixtures.prototype.addToContainer_ = function(html){
+  var container = $(document.body).find('#'+this.containerId).append(html)
+  if(!container.length){
+    this.createContainer_(html)
+  }
+}
+
+jasmine.Fixtures.prototype.getFixtureHtml_ = function(url) {
+  if (typeof this.fixturesCache_[url] === 'undefined') {
+    this.loadFixtureIntoCache_(url)
+  }
+  return this.fixturesCache_[url]
+}
 
 jasmine.Fixtures.prototype.loadFixtureIntoCache_ = function(relativeUrl) {
-  var self = this;
-  var url = this.fixturesPath.match('/$') ? this.fixturesPath + relativeUrl : this.fixturesPath + '/' + relativeUrl;
-  jQuery.ajax({
+  var url = this.makeFixtureUrl_(relativeUrl)
+  var request = $.ajax({
+    type: "GET",
+    url: url + "?" + new Date().getTime(),
+    async: false
+  })
+  this.fixturesCache_[relativeUrl] = request.responseText
+}
+
+jasmine.Fixtures.prototype.makeFixtureUrl_ = function(relativeUrl){
+  return this.fixturesPath.match('/$') ? this.fixturesPath + relativeUrl : this.fixturesPath + '/' + relativeUrl
+}
+
+jasmine.Fixtures.prototype.proxyCallTo_ = function(methodName, passedArguments) {
+  return this[methodName].apply(this, passedArguments)
+}
+
+
+jasmine.StyleFixtures = function() {
+  this.fixturesCache_ = {}
+  this.fixturesNodes_ = []
+  this.fixturesPath = 'spec/javascripts/fixtures'
+}
+
+jasmine.StyleFixtures.prototype.set = function(css) {
+  this.cleanUp()
+  this.createStyle_(css)
+}
+
+jasmine.StyleFixtures.prototype.appendSet = function(css) {
+  this.createStyle_(css)
+}
+
+jasmine.StyleFixtures.prototype.preload = function() {
+  this.read_.apply(this, arguments)
+}
+
+jasmine.StyleFixtures.prototype.load = function() {
+  this.cleanUp()
+  this.createStyle_(this.read_.apply(this, arguments))
+}
+
+jasmine.StyleFixtures.prototype.appendLoad = function() {
+  this.createStyle_(this.read_.apply(this, arguments))
+}
+
+jasmine.StyleFixtures.prototype.cleanUp = function() {
+  while(this.fixturesNodes_.length) {
+    this.fixturesNodes_.pop().remove()
+  }
+}
+
+jasmine.StyleFixtures.prototype.createStyle_ = function(html) {
+  var styleText = $('<div></div>').html(html).text(),
+    style = $('<style>' + styleText + '</style>')
+
+  this.fixturesNodes_.push(style)
+
+  $('head').append(style)
+}
+
+jasmine.StyleFixtures.prototype.clearCache = jasmine.Fixtures.prototype.clearCache
+
+jasmine.StyleFixtures.prototype.read_ = jasmine.Fixtures.prototype.read
+
+jasmine.StyleFixtures.prototype.getFixtureHtml_ = jasmine.Fixtures.prototype.getFixtureHtml_
+
+jasmine.StyleFixtures.prototype.loadFixtureIntoCache_ = jasmine.Fixtures.prototype.loadFixtureIntoCache_
+
+jasmine.StyleFixtures.prototype.makeFixtureUrl_ = jasmine.Fixtures.prototype.makeFixtureUrl_
+
+jasmine.StyleFixtures.prototype.proxyCallTo_ = jasmine.Fixtures.prototype.proxyCallTo_
+
+jasmine.getJSONFixtures = function() {
+  return jasmine.currentJSONFixtures_ = jasmine.currentJSONFixtures_ || new jasmine.JSONFixtures()
+}
+
+jasmine.JSONFixtures = function() {
+  this.fixturesCache_ = {}
+  this.fixturesPath = 'spec/javascripts/fixtures/json'
+}
+
+jasmine.JSONFixtures.prototype.load = function() {
+  this.read.apply(this, arguments)
+  return this.fixturesCache_
+}
+
+jasmine.JSONFixtures.prototype.read = function() {
+  var fixtureUrls = arguments
+  for(var urlCount = fixtureUrls.length, urlIndex = 0; urlIndex < urlCount; urlIndex++) {
+    this.getFixtureData_(fixtureUrls[urlIndex])
+  }
+  return this.fixturesCache_
+}
+
+jasmine.JSONFixtures.prototype.clearCache = function() {
+  this.fixturesCache_ = {}
+}
+
+jasmine.JSONFixtures.prototype.getFixtureData_ = function(url) {
+  this.loadFixtureIntoCache_(url)
+  return this.fixturesCache_[url]
+}
+
+jasmine.JSONFixtures.prototype.loadFixtureIntoCache_ = function(relativeUrl) {
+  var self = this
+  var url = this.fixturesPath.match('/$') ? this.fixturesPath + relativeUrl : this.fixturesPath + '/' + relativeUrl
+  $.ajax({
     async: false, // must be synchronous to guarantee that no tests are run before fixture is loaded
     cache: false,
-    dataType: 'html',
+    dataType: 'json',
     url: url,
     success: function(data) {
-      self.fixturesCache_[relativeUrl] = data;
-    },
-    error: function(jqXHR, status, errorThrown) {
-        throw Error('Fixture could not be loaded: ' + url + ' (status: ' + status + ', message: ' + errorThrown.message + ')');
-    }
-  });
-};
-
-jasmine.Fixtures.prototype.proxyCallTo_ = function(methodName, passedArguments) {
-  return this[methodName].apply(this, passedArguments);
-};
-
-
-jasmine.JQuery = function() {};
+      self.fixturesCache_[relativeUrl] = data
+    },
+    fail: function(jqXHR, status, errorThrown) {
+        throw Error('JSONFixture could not be loaded: ' + url + ' (status: ' + status + ', message: ' + errorThrown.message + ')')
+    }
+  })
+}
+
+jasmine.JSONFixtures.prototype.proxyCallTo_ = function(methodName, passedArguments) {
+  return this[methodName].apply(this, passedArguments)
+}
+
+jasmine.JQuery = function() {}
 
 jasmine.JQuery.browserTagCaseIndependentHtml = function(html) {
-  return jQuery('<div/>').append(html).html();
-};
+  return $('<div/>').append(html).html()
+}
 
 jasmine.JQuery.elementToString = function(element) {
-  return jQuery('<div />').append(element.clone()).html();
-};
-
-jasmine.JQuery.matchersClass = {};
-
-(function(namespace) {
+  var domEl = $(element).get(0)
+  if (domEl == undefined || domEl.cloneNode)
+    return $('<div />').append($(element).clone()).html()
+  else
+    return element.toString()
+}
+
+jasmine.JQuery.matchersClass = {}
+
+!function(namespace) {
   var data = {
     spiedEvents: {},
     handlers:    []
-  };
+  }
 
   namespace.events = {
     spyOn: function(selector, eventName) {
       var handler = function(e) {
-        data.spiedEvents[[selector, eventName]] = e;
-      };
-      jQuery(selector).bind(eventName, handler);
-      data.handlers.push(handler);
+        data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)] = e
+      }
+      $(selector).bind(eventName, handler)
+      data.handlers.push(handler)
+      return {
+        selector: selector,
+        eventName: eventName,
+        handler: handler,
+        reset: function(){
+          delete data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]
+        }
+      }
     },
 
     wasTriggered: function(selector, eventName) {
-      return !!(data.spiedEvents[[selector, eventName]]);
+      return !!(data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)])
+    },
+
+    wasPrevented: function(selector, eventName) {
+      var e;
+      return (e = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]) && e.isDefaultPrevented()
     },
 
     cleanUp: function() {
-      data.spiedEvents = {};
-      data.handlers    = [];
-    }
-  }
-})(jasmine.JQuery);
-
-(function(){
+      data.spiedEvents = {}
+      data.handlers    = []
+    }
+  }
+}(jasmine.JQuery)
+
+!function(){
   var jQueryMatchers = {
     toHaveClass: function(className) {
-      return this.actual.hasClass(className);
+      return this.actual.hasClass(className)
+    },
+
+    toHaveCss: function(css){
+      for (var prop in css){
+        if (this.actual.css(prop) !== css[prop]) return false
+      }
+      return true
     },
 
     toBeVisible: function() {
-      return this.actual.is(':visible');
+      return this.actual.is(':visible')
     },
 
     toBeHidden: function() {
-      return this.actual.is(':hidden');
+      return this.actual.is(':hidden')
     },
 
     toBeSelected: function() {
-      return this.actual.is(':selected');
+      return this.actual.is(':selected')
     },
 
     toBeChecked: function() {
-      return this.actual.is(':checked');
+      return this.actual.is(':checked')
     },
 
     toBeEmpty: function() {
-      return this.actual.is(':empty');
+      return this.actual.is(':empty')
     },
 
     toExist: function() {
-      return this.actual.size() > 0;
+      return $(document).find(this.actual).length
+    },
+
+    toHaveLength: function(length) {
+      return this.actual.length === length
     },
 
     toHaveAttr: function(attributeName, expectedAttributeValue) {
-      return hasProperty(this.actual.attr(attributeName), expectedAttributeValue);
+      return hasProperty(this.actual.attr(attributeName), expectedAttributeValue)
+    },
+
+    toHaveProp: function(propertyName, expectedPropertyValue) {
+      return hasProperty(this.actual.prop(propertyName), expectedPropertyValue)
     },
 
     toHaveId: function(id) {
-      return this.actual.attr('id') == id;
+      return this.actual.attr('id') == id
     },
 
     toHaveHtml: function(html) {
-      return this.actual.html() == jasmine.JQuery.browserTagCaseIndependentHtml(html);
+      return this.actual.html() == jasmine.JQuery.browserTagCaseIndependentHtml(html)
+    },
+
+    toContainHtml: function(html){
+      var actualHtml = this.actual.html()
+      var expectedHtml = jasmine.JQuery.browserTagCaseIndependentHtml(html)
+      return (actualHtml.indexOf(expectedHtml) >= 0)
     },
 
     toHaveText: function(text) {
-      if (text && jQuery.isFunction(text.test)) {
-        return text.test(this.actual.text());
+      var trimmedText = $.trim(this.actual.text())
+      if (text && $.isFunction(text.test)) {
+        return text.test(trimmedText)
       } else {
-        return this.actual.text() == text;
+        return trimmedText == text
       }
     },
 
     toHaveValue: function(value) {
-      return this.actual.val() == value;
+      return this.actual.val() === value
     },
 
     toHaveData: function(key, expectedValue) {
-      return hasProperty(this.actual.data(key), expectedValue);
+      return hasProperty(this.actual.data(key), expectedValue)
     },
 
     toBe: function(selector) {
-      return this.actual.is(selector);
+      return this.actual.is(selector)
     },
 
     toContain: function(selector) {
-      return this.actual.find(selector).size() > 0;
+      return this.actual.find(selector).length
     },
 
     toBeDisabled: function(selector){
-      return this.actual.is(':disabled');
-    },
-
-    // tests the existence of a specific event binding
-    toHandle: function(eventName) {
-      var events = this.actual.data("events");
-      return events && events[eventName].length > 0;
-    },
-    
+      return this.actual.is(':disabled')
+    },
+
+    toBeFocused: function(selector) {
+      return this.actual[0] === this.actual[0].ownerDocument.activeElement
+    },
+
+    toHandle: function(event) {
+
+      var events = $._data(this.actual.get(0), "events")
+
+      if(!events || !event || typeof event !== "string") {
+        return false
+      }
+
+      var namespaces = event.split(".")
+      var eventType = namespaces.shift()
+      var sortedNamespaces = namespaces.slice(0).sort()
+      var namespaceRegExp = new RegExp("(^|\\.)" + sortedNamespaces.join("\\.(?:.*\\.)?") + "(\\.|$)")
+
+      if(events[eventType] && namespaces.length) {
+        for(var i = 0; i < events[eventType].length; i++) {
+          var namespace = events[eventType][i].namespace
+          if(namespaceRegExp.test(namespace)) {
+            return true
+          }
+        }
+      } else {
+        return events[eventType] && events[eventType].length > 0
+      }
+    },
+
     // tests the existence of a specific event binding + handler
     toHandleWith: function(eventName, eventHandler) {
-      var stack = this.actual.data("events")[eventName];
-      var i;
-      for (i = 0; i < stack.length; i++) {
-        if (stack[i].handler == eventHandler) {
-          return true;
-        }
-      }
-      return false;
-    }
-  };
+      var stack = $._data(this.actual.get(0), "events")[eventName]
+      for (var i = 0; i < stack.length; i++) {
+        if (stack[i].handler == eventHandler) return true
+      }
+      return false
+    }
+  }
 
   var hasProperty = function(actualValue, expectedValue) {
-    if (expectedValue === undefined) {
-      return actualValue !== undefined;
-    }
-    return actualValue == expectedValue;
-  };
+    if (expectedValue === undefined) return actualValue !== undefined
+    return actualValue == expectedValue
+  }
 
   var bindMatcher = function(methodName) {
-    var builtInMatcher = jasmine.Matchers.prototype[methodName];
+    var builtInMatcher = jasmine.Matchers.prototype[methodName]
 
     jasmine.JQuery.matchersClass[methodName] = function() {
-      if (this.actual instanceof jQuery) {
-        var result = jQueryMatchers[methodName].apply(this, arguments);
-        this.actual = jasmine.JQuery.elementToString(this.actual);
-        return result;
-      }
-
-      if (builtInMatcher) {
-        return builtInMatcher.apply(this, arguments);
-      }
-
-      return false;
-    };
-  };
+      if (this.actual
+        && (this.actual instanceof $
+          || jasmine.isDomNode(this.actual))) {
+            this.actual = $(this.actual)
+            var result = jQueryMatchers[methodName].apply(this, arguments)
+            var element
+            if (this.actual.get && (element = this.actual.get()[0]) && !$.isWindow(element) && element.tagName !== "HTML")
+              this.actual = jasmine.JQuery.elementToString(this.actual)
+            return result
+          }
+
+          if (builtInMatcher) {
+            return builtInMatcher.apply(this, arguments)
+          }
+
+          return false
+    }
+  }
 
   for(var methodName in jQueryMatchers) {
-    bindMatcher(methodName);
-  }
-})();
+    bindMatcher(methodName)
+  }
+}()
 
 beforeEach(function() {
-  this.addMatchers(jasmine.JQuery.matchersClass);
+  this.addMatchers(jasmine.JQuery.matchersClass)
   this.addMatchers({
     toHaveBeenTriggeredOn: function(selector) {
       this.message = function() {
         return [
-          "Expected event " + this.actual + " to have been triggered on" + selector,
-          "Expected event " + this.actual + " not to have been triggered on" + selector
-        ];
-      };
-      return jasmine.JQuery.events.wasTriggered(selector, this.actual);
+          "Expected event " + this.actual + " to have been triggered on " + selector,
+          "Expected event " + this.actual + " not to have been triggered on " + selector
+        ]
+      }
+      return jasmine.JQuery.events.wasTriggered(selector, this.actual)
     }
   })
-});
+  this.addMatchers({
+    toHaveBeenTriggered: function(){
+      var eventName = this.actual.eventName,
+          selector = this.actual.selector
+      this.message = function() {
+        return [
+          "Expected event " + eventName + " to have been triggered on " + selector,
+          "Expected event " + eventName + " not to have been triggered on " + selector
+        ]
+      }
+      return jasmine.JQuery.events.wasTriggered(selector, eventName)
+     }
+  })
+  this.addMatchers({
+    toHaveBeenPreventedOn: function(selector) {
+      this.message = function() {
+        return [
+          "Expected event " + this.actual + " to have been prevented on " + selector,
+          "Expected event " + this.actual + " not to have been prevented on " + selector
+        ]
+      }
+      return jasmine.JQuery.events.wasPrevented(selector, this.actual)
+    }
+  })
+  this.addMatchers({
+    toHaveBeenPrevented: function() {
+      var eventName = this.actual.eventName,
+          selector = this.actual.selector
+      this.message = function() {
+        return [
+          "Expected event " + eventName + " to have been prevented on " + selector,
+          "Expected event " + eventName + " not to have been prevented on " + selector
+        ]
+      }
+      return jasmine.JQuery.events.wasPrevented(selector, eventName)
+    }
+  })
+})
 
 afterEach(function() {
-  jasmine.getFixtures().cleanUp();
-  jasmine.JQuery.events.cleanUp();
-});
+  jasmine.getFixtures().cleanUp()
+  jasmine.getStyleFixtures().cleanUp()
+  jasmine.JQuery.events.cleanUp()
+})

pyenvjasmine/envjasmine/samples/ajaxDemo.js

@@ -1 +1 @@
 // This is the contents of ajaxDemo.js, the file to test.
-var TwitterWidget = {
-    makeRequest: function() {
-        var self = this;
-        
-        $.ajax({
-            method: "GET",
-            url: "http://api.twitter.com/1/statuses/show/trevmex.json",
-            datatype: "json",
-            success: function (data) {
-                self.addDataToDOM(data);
-            }
-        });
-    },
 
-    addDataToDOM: function(data) {
-        // does something
-        // We will mock this behavior with a spy.
-        
-        return data;
-    }
+if (typeof(NS) === 'undefined' || !NS) {
+    var NS = {};
+}
+
+NS.greeter = function (name) {
+    return 'Hello ' + name + '!';
 };
+
+NS.greetUser = function (id) {
+    return $.ajax({
+        data: id,
+        url: 'name.html',
+        success: function (data) {
+            NS.greeter(data.name);
+        }
+    });
+};
+
+

pyenvjasmine/envjasmine/samples/demo.js

@@ -1 +1 @@
 // Sample demo
 
-if (!this.Demo) {
-    Demo = {};
+if (typeof(NS) === 'undefined' || !NS) {
+    var NS = {};
 }
 
-Demo.checkBirthdate = function (user) {
-    return !user.birthdate ? false : true;
-}
+NS.greeter = function (name) {
+    return 'Hello ' + name + '!';
+};

pyenvjasmine/envjasmine/specs/ajaxDemo.spec.js

@@ -1 @@
-// Load the file to test here.
-//
-// Example:
 EnvJasmine.load(EnvJasmine.jsDir + "ajaxDemo.js");
 
-// This is the test code.
-describe("AjaxDemo", function () {
-    it("calls the addDataToDOM function on success", function () {
-        TwitterWidget.makeRequest(); // Make the AJAX call
-
-        spyOn(TwitterWidget, "addDataToDOM"); // Add a spy to the callback
-
-        mostRecentAjaxRequest().response({status: 200, responseText: "foo"}); // Mock the response
-
-        expect(TwitterWidget.addDataToDOM).toHaveBeenCalledWith("foo");
+describe('greetUser', function () {
+    it('calls greeter on success', function () {
+        NS.greetUser(1);
+        spyOn(NS, 'greeter');
+        mostRecentAjaxRequest().response({
+            status: 200,
+            responseText: {"name":"Trevor"}
+        });
+        expect(NS.greeter).toHaveBeenCalledWith('Trevor');
     });
 });

pyenvjasmine/envjasmine/specs/demo.spec.js

@@ -1 @@
-// Load the file to test here.
-//
-// Example:
 EnvJasmine.load(EnvJasmine.jsDir + "demo.js");
 
-// Load mocks for this spec
-EnvJasmine.load(EnvJasmine.mocksDir + "demo.mock.js");
-
-describe("Demo", function () {
-    it("asserts that one plus one equals two", function () {
-        expect(1 + 1 == 2).toEqual(true);
-    });
-
-    it("asserts that 1 + 1 does not equal 3", function () {
-        expect(1 + 1 == 3).toEqual(false);
-    });
-
-    it("asserts that a user has a birthdate", function () {
-        expect(Demo.checkBirthdate(demoUser)).toEqual(true);
-    });
-
-    it("asserts that an ill-formed user has no birthdate", function () {
-        expect(Demo.checkBirthdate(badUser)).toEqual(false);
+describe('greeter', function () {
+    it('greets me', function () {
+        expect(NS.greeter('Trevor')).toEqual('Hello Trevor!');
     });
 });