now all the browser tests pass

index.html

@@ -5,11 +5,9 @@
     <title>Contract.js Test Suite</title>
     <link rel="Stylesheet" href="test/qunit.css"></script>
 
-    <script type="text/javascript" src="src/stacktrace.js"></script>
-    <script type="text/javascript" src="src/contracts.js"></script>
+    <script type="text/javascript" src="lib/contracts.js"></script>
 
     <script type="text/javascript" src="test/jquery.js"></script>
-    <script type="text/javascript" src="test/jquery-c.js"></script>
 
     <script type="text/javascript" src="test/qunit.js"></script>
     <script type="text/javascript" src="test/test.js"></script>

lib/contracts.js

@@ -332,25 +332,7 @@ printStackTrace.implementation.prototype = {
     }
 };
 
-(function() {(function() {
-  var old_require;
-  if (typeof require !== 'undefined' && require !== null) {
-    old_require = require;
-    require = function(mod, filename) {
-      var key, m = old_require(mod);
-      for(key in m) {
-        if(typeof(m[key]) && m[key].hasOwnProperty && m[key].hasOwnProperty('use')) {
-          m[key] = m[key].use(filename, mod);
-        }
-      }
-      return m;
-    };
-    for(var key in old_require) {
-      require[key] = old_require[key];
-    }
-  }
-})();
-
+(function() {
 
   "use strict";
 
@@ -1354,7 +1336,7 @@ printStackTrace.implementation.prototype = {
     return enabled = b;
   };
 
-  root.autoload = function(obj) {
+  root.autoload = function() {
     var globalObj, name;
     globalObj = typeof window !== "undefined" && window !== null ? window : global;
     for (name in root) {
@@ -1363,4 +1345,4 @@ printStackTrace.implementation.prototype = {
     }
   };
 
-}).call(this);
+}).call(this);

src/contracts.coffee

@@ -335,9 +335,9 @@ fun = (dom, rng, options) ->
           res = new bf()
           res = clean_rng.check(res, pos, neg, parents, stack)
         else
-          if options["this"]
+          if options.this
             # blame is reversed
-            thisc = options["this"].check(this, neg, pos, parents, stack)
+            thisc = options.this.check(this, neg, pos, parents, stack)
           else
             thisc = this
           res = clean_rng.check(f.apply(thisc, args), pos, neg, parents, stack)
@@ -851,7 +851,7 @@ root.opt       =  opt
 root.guard     =  guard
 root.enabled   =  (b) -> enabled = b
 # puts every exported function onto the global scope
-root.autoload  = (obj) ->
+root.autoload  = ->
   globalObj = window ? global # browser or node
   globalObj[name] = root[name] for own name of root
   return

test/test.js

@@ -1,16 +1,5 @@
-var C = Contracts.combinators, 
-    K = Contracts.contracts; 
-
-function load(obj) {
-    var name;
-    for(name in obj) {
-        if(obj.hasOwnProperty(name)) {
-            window[name] = obj[name];
-        }
-    }
-}
-load(Contracts.combinators);
-load(Contracts.contracts);
+Contracts.autoload();
+
 var server = "server";
 var client = "client";