Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 31215 invoked from network); 12 Sep 2010 09:02:30 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 12 Sep 2010 09:02:30 -0000 Received: (qmail 90670 invoked by uid 500); 12 Sep 2010 09:02:29 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 90546 invoked by uid 500); 12 Sep 2010 09:02:27 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 90539 invoked by uid 99); 12 Sep 2010 09:02:26 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 12 Sep 2010 09:02:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 12 Sep 2010 09:02:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9943723889E7; Sun, 12 Sep 2010 09:01:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r996267 - /couchdb/trunk/share/www/script/test/design_docs.js Date: Sun, 12 Sep 2010 09:01:47 -0000 To: commits@couchdb.apache.org From: jchris@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100912090147.9943723889E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jchris Date: Sun Sep 12 09:01:47 2010 New Revision: 996267 URL: http://svn.apache.org/viewvc?rev=996267&view=rev Log: additional test for non-circular commonjs require. closes COUCHDB-869 Modified: couchdb/trunk/share/www/script/test/design_docs.js Modified: couchdb/trunk/share/www/script/test/design_docs.js URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/design_docs.js?rev=996267&r1=996266&r2=996267&view=diff ============================================================================== --- couchdb/trunk/share/www/script/test/design_docs.js (original) +++ couchdb/trunk/share/www/script/test/design_docs.js Sun Sep 12 09:01:47 2010 @@ -58,7 +58,8 @@ function() { }, shows: { simple: "function() {return 'ok'};", - requirey : "function() { var lib = require('whatever/commonjs/upper'); return lib.testing; };" + requirey : "function() { var lib = require('whatever/commonjs/upper'); return lib.testing; };", + circular : "function() { var lib = require('whatever/commonjs/upper'); return JSON.stringify(this); };" } }; @@ -88,6 +89,10 @@ function() { T(xhr.status == 200); TEquals("PLANKTONwhatever/commonjs/upperplankton", xhr.responseText); + var xhr = CouchDB.request("GET", "/test_suite_db/_design/test/_show/circular"); + T(xhr.status == 200); + TEquals("javascript", JSON.parse(xhr.responseText).language); + // test that we get design doc info back var dinfo = db.designInfo("_design/test"); TEquals("test", dinfo.name);