null+****@clear*****
null+****@clear*****
2012年 7月 12日 (木) 13:19:02 JST
SHIMODA Hiroshi 2012-07-12 13:19:02 +0900 (Thu, 12 Jul 2012) New Revision: 3be63b26a8bf94d32da56170946fb04fb2724b40 https://github.com/groonga/gcs/commit/3be63b26a8bf94d32da56170946fb04fb2724b40 Log: Unify test suite for auto detection of the search domain Modified files: test/domain.test.js Modified: test/domain.test.js (+34 -36) =================================================================== --- test/domain.test.js 2012-07-12 13:17:30 +0900 (09597fe) +++ test/domain.test.js 2012-07-12 13:19:02 +0900 (9faf6fe) @@ -69,23 +69,6 @@ suite('domain', function() { }); }); - suite('from host name', function() { - test('valid', function() { - var host = 'doc-test0123-id0123.example.com'; - var request = { headers: { host: host } }; - var domain = new Domain(request); - assert.equal(domain.name, 'test0123'); - }); - - test('invalid', function() { - assert.throw(function() { - var host = 'doc-domain_name-id0123.example.com'; - var request = { headers: { host: host } }; - var domain = new Domain(request); - }, /cannot appear in a domain name/); - }); - }); - suite('getNameFromHost', function() { test('valid, doc, lower case and number', function() { var host = 'doc-test0123-id0123.example.com'; @@ -124,25 +107,6 @@ suite('domain', function() { }); }); - suite('from path', function() { - test('valid', function() { - var host = 'example.com'; - var request = { headers: { host: host }, - url: '/gcs/test0123' }; - var domain = new Domain(request); - assert.equal(domain.name, 'test0123'); - }); - - test('invalid', function() { - assert.throw(function() { - var host = 'example.com'; - var request = { headers: { host: host }, - url: '/gcs/test_01234' }; - var domain = new Domain(request); - }, /cannot appear in a domain name/); - }); - }); - suite('getNameFromPath', function() { test('valid, lower case and number', function() { var path = '/gcs/test0123/'; @@ -162,6 +126,40 @@ suite('domain', function() { assert.equal(name, ''); }); }); + + suite('auto detection', function() { + test('from host, valid', function() { + var host = 'doc-test0123-id0123.example.com'; + var request = { headers: { host: host } }; + var domain = new Domain(request); + assert.equal(domain.name, 'test0123'); + }); + + test('from host, invalid', function() { + assert.throw(function() { + var host = 'doc-domain_name-id0123.example.com'; + var request = { headers: { host: host } }; + var domain = new Domain(request); + }, /cannot appear in a domain name/); + }); + + test('from path, valid', function() { + var host = 'example.com'; + var request = { headers: { host: host }, + url: '/gcs/test0123' }; + var domain = new Domain(request); + assert.equal(domain.name, 'test0123'); + }); + + test('from path, invalid', function() { + assert.throw(function() { + var host = 'example.com'; + var request = { headers: { host: host }, + url: '/gcs/test_01234' }; + var domain = new Domain(request); + }, /cannot appear in a domain name/); + }); + }); }); suite('IndexField', function() { -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...Download