jasmine 0.4.4 → 0.4.5

data/jasmine/lib/{jasmine-0.10.0.js → jasmine-0.10.1.js}

@@ -15,7 +15,7 @@ jasmine.unimplementedMethod_ = function() {
 /**
  * Use <code>jasmine.undefined</code> instead of <code>undefined</code>, since <code>undefined</code is just
  * a plain old variable and may be redefined by somebody else.
- * 
+ *
  * @private
  */
 jasmine.undefined = jasmine.___undefined___;
@@ -66,7 +66,7 @@ jasmine.ExpectationResult = function(params) {
 
   /** @deprecated */
   this.details = params.details;
-  
+
   this.message = this.passed_ ? 'Passed.' : params.message;
   this.trace = this.passed_ ? '' : new Error(this.message);
 };
@@ -89,11 +89,7 @@ jasmine.getEnv = function() {
  * @returns {Boolean}
  */
 jasmine.isArray_ = function(value) {
-  return value &&
-         typeof value === 'object' &&
-         typeof value.length === 'number' &&
-         typeof value.splice === 'function' &&
-         !(value.propertyIsEnumerable('length'));
+  return Object.prototype.toString.apply(value) === '[object Array]';
 };
 
 /**
@@ -350,6 +346,9 @@ jasmine.isSpy = function(putativeSpy) {
  * @param {Array} methodNames array of names of methods to make spies
  */
 jasmine.createSpyObj = function(baseName, methodNames) {
+  if (!jasmine.isArray_(methodNames) || methodNames.length == 0) {
+    throw new Error('createSpyObj requires a non-empty array of method names to create spies for');
+  }
   var obj = {};
   for (var i = 0; i < methodNames.length; i++) {
     obj[methodNames[i]] = jasmine.createSpy(baseName + '.' + methodNames[i]);
@@ -1040,7 +1039,7 @@ jasmine.Matchers.matcherFn_ = function(matcherName, matcherFunction) {
     var matcherArgs = jasmine.util.argsToArray(arguments);
     var result = matcherFunction.apply(this, arguments);
     if (this.reportWasCalled_) return result;
-    
+
     var message;
     if (!result) {
       if (this.message) {
@@ -1204,31 +1203,32 @@ jasmine.Matchers.prototype.wasNotCalled = function() {
  *
  */
 jasmine.Matchers.prototype.wasCalledWith = function() {
+  var expectedArgs = jasmine.util.argsToArray(arguments);
   if (!jasmine.isSpy(this.actual)) {
     throw new Error('Expected a spy, but got ' + jasmine.Matchers.pp(this.actual) + '.');
   }
-
   this.message = function() {
     if (this.actual.callCount == 0) {
-      return "Expected spy to have been called with " + jasmine.pp(arguments) + " but it was never called.";
+      return "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was never called.";
     } else {
-      return "Expected spy to have been called with " + jasmine.pp(arguments) + " but was called with " + jasmine.pp(this.actual.argsForCall);
+      return "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall);
     }
   };
 
-  return this.env.contains_(this.actual.argsForCall, jasmine.util.argsToArray(arguments));
+  return this.env.contains_(this.actual.argsForCall, expectedArgs);
 };
 
 jasmine.Matchers.prototype.wasNotCalledWith = function() {
+  var expectedArgs = jasmine.util.argsToArray(arguments);
   if (!jasmine.isSpy(this.actual)) {
     throw new Error('Expected a spy, but got ' + jasmine.Matchers.pp(this.actual) + '.');
   }
 
   this.message = function() {
-    return "Expected spy not to have been called with " + jasmine.pp(arguments) + " but it was";
+    return "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was";
   };
 
-  return !this.env.contains_(this.actual.argsForCall, jasmine.util.argsToArray(arguments));
+  return !this.env.contains_(this.actual.argsForCall, expectedArgs);
 };
 
 /**
@@ -2256,6 +2256,6 @@ window.clearInterval = function(timeoutKey) {
 jasmine.version_= {
   "major": 0,
   "minor": 10,
-  "build": 0,
-  "revision": 1264648722
+  "build": 1,
+  "revision": 1267069453
   };

data/spec/server_spec.rb

@@ -45,6 +45,12 @@ describe Jasmine::Server do
     headers["Location"].should == "/"
   end
 
+  it "should 404 non-existent files" do
+    code, headers, body = @thin_app.call("PATH_INFO" => "/some-non-existent-file", "SCRIPT_NAME" => "xxx")
+    code.should == 404
+
+  end
+
   describe "/ page" do
     it "should load each js file in order" do
       code, headers, body = @thin_app.call("PATH_INFO" => "/", "SCRIPT_NAME" => "xxx", "REQUEST_METHOD" => 'GET')
@@ -54,6 +60,14 @@ describe Jasmine::Server do
       body.should include("\"/spec/file2.js")
       body.should satisfy {|s| s.index("/src/file1.js") < s.index("/spec/file2.js") }
     end
+
+    it "should return an empty 200 for HEAD requests to /" do
+      code, headers, body = @thin_app.call("PATH_INFO" => "/", "SCRIPT_NAME" => "xxx", "REQUEST_METHOD" => 'HEAD')
+      code.should == 200
+      headers.should == { 'Content-Type' => 'text/html' }
+      body.should == ''
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jasmine
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Rajan Agaskar
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 -08:00
+date: 2010-02-24 00:00:00 -08:00
 default_executable: jasmine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,7 +96,7 @@ files:
 - jasmine/contrib/ruby/run.html
 - jasmine/lib/TrivialReporter.js
 - jasmine/lib/consolex.js
-- jasmine/lib/jasmine-0.10.0.js
+- jasmine/lib/jasmine-0.10.1.js
 - jasmine/lib/jasmine.css
 - jasmine/lib/json2.js
 - lib/jasmine.rb