diff options
author | Noah Slater <nslater@apache.org> | 2009-07-16 20:59:05 +0000 |
---|---|---|
committer | Noah Slater <nslater@apache.org> | 2009-07-16 20:59:05 +0000 |
commit | 6c9ef188eb84daa48734c1be086281437d3d9396 (patch) | |
tree | ddae869d029209392c0ad0e0f2aacabe17e69837 | |
parent | 111e428481cbef587b906f9b067cd07a3b96610c (diff) | |
parent | 0308efb1a1f885ab51d53db203e2f4a51d947a23 (diff) | |
download | couchdb-0.9.1.tar.gz |
tagging 0.9.10.9.1
git-svn-id: https://svn.apache.org/repos/asf/couchdb/tags/0.9.1@794853 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | share/Makefile.am | 1 | ||||
-rw-r--r-- | share/www/_sidebar.html | 14 | ||||
-rw-r--r-- | share/www/script/jquery.couch.js | 4 | ||||
-rw-r--r-- | test/couch_config_test.erl | 20 | ||||
-rw-r--r-- | test/couch_config_writer_test.erl | 18 | ||||
-rw-r--r-- | test/runner.erl | 12 | ||||
-rwxr-xr-x | test/runner.sh | 12 |
7 files changed, 72 insertions, 9 deletions
diff --git a/share/Makefile.am b/share/Makefile.am index ab15b02b9..1542e13c9 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -87,6 +87,7 @@ nobase_dist_localdata_DATA = \ www/script/test/large_docs.js \ www/script/test/utf8.js \ www/script/test/attachments.js \ + www/script/test/attachment_names.js \ www/script/test/attachment_paths.js \ www/script/test/attachment_views.js \ www/script/test/design_paths.js \ diff --git a/share/www/_sidebar.html b/share/www/_sidebar.html index 670a8e541..23564c9ff 100644 --- a/share/www/_sidebar.html +++ b/share/www/_sidebar.html @@ -1,3 +1,17 @@ +<!-- + +Licensed under the Apache License, Version 2.0 (the "License"); you may not use +this file except in compliance with the License. You may obtain a copy of the +License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +--> <div id="sidebar"> <a href="index.html"> <img id="logo" src="image/logo.png" width="175" height="150" alt="Apache CouchDB: Relax"> diff --git a/share/www/script/jquery.couch.js b/share/www/script/jquery.couch.js index d6aa512ec..919647aad 100644 --- a/share/www/script/jquery.couch.js +++ b/share/www/script/jquery.couch.js @@ -239,9 +239,9 @@ dataType: "json", data: toJSON(doc), complete: function(req) { var resp = $.httpData(req, "json") - doc._id = resp.id; - doc._rev = resp.rev; if (req.status == 201) { + doc._id = resp.id; + doc._rev = resp.rev; if (options.success) options.success(resp); } else if (options.error) { options.error(req.status, resp.error, resp.reason); diff --git a/test/couch_config_test.erl b/test/couch_config_test.erl index faacd5fc5..8a1555c2f 100644 --- a/test/couch_config_test.erl +++ b/test/couch_config_test.erl @@ -1,7 +1,19 @@ +% Licensed under the Apache License, Version 2.0 (the "License"); you may not +% use this file except in compliance with the License. You may obtain a copy of +% the License at +% +% http://www.apache.org/licenses/LICENSE-2.0 +% +% Unless required by applicable law or agreed to in writing, software +% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +% License for the specific language governing permissions and limitations under +% the License. + % couch_config module test suote % Set up test suite -% ?MODULE_test() returns a list of functions +% ?MODULE_test() returns a list of functions % that run the actual tests. couch_config_test() -> [ @@ -10,7 +22,7 @@ couch_config_test() -> % test functions - + store_strings() -> Filename = "test.ini", file:write_file(Filename, ""), @@ -26,8 +38,8 @@ store_strings() -> exit(Proc, kill), receive {'EXIT', Proc, _} -> ok end, - + % clean up file:delete(Filename), - Value = Result.
\ No newline at end of file + Value = Result. diff --git a/test/couch_config_writer_test.erl b/test/couch_config_writer_test.erl index aa88abeba..1933121b7 100644 --- a/test/couch_config_writer_test.erl +++ b/test/couch_config_writer_test.erl @@ -1,7 +1,19 @@ +% Licensed under the Apache License, Version 2.0 (the "License"); you may not +% use this file except in compliance with the License. You may obtain a copy of +% the License at +% +% http://www.apache.org/licenses/LICENSE-2.0 +% +% Unless required by applicable law or agreed to in writing, software +% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +% License for the specific language governing permissions and limitations under +% the License. + % couch_config_writer module test suote % Set up test suite -% ?MODULE_test() returns a list of functions +% ?MODULE_test() returns a list of functions % that run the actual tests. % todo, fix replace_existing_variable2 (i.e. reordering) couch_config_writer_test() -> @@ -186,12 +198,12 @@ run_operation_and_compare_results(Contents, Expect, Config) -> % call replace function [couch_config_writer:save_to_file(ConfigVar, Filename) || ConfigVar <- Config], - + % compare new file with expected file {ok, Result_} = file:read_file(Filename), Result = binary_to_list(Result_), % clean up % file:delete(Filename), - + Result = Expect. diff --git a/test/runner.erl b/test/runner.erl index 5cf559f3d..6c4518594 100644 --- a/test/runner.erl +++ b/test/runner.erl @@ -1,3 +1,15 @@ +% Licensed under the Apache License, Version 2.0 (the "License"); you may not +% use this file except in compliance with the License. You may obtain a copy of +% the License at +% +% http://www.apache.org/licenses/LICENSE-2.0 +% +% Unless required by applicable law or agreed to in writing, software +% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +% License for the specific language governing permissions and limitations under +% the License. + -module(runner). -export([run/0]). diff --git a/test/runner.sh b/test/runner.sh index 6715f5f99..51762d45f 100755 --- a/test/runner.sh +++ b/test/runner.sh @@ -1,5 +1,17 @@ #!/bin/sh -e +# Licensed under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy of +# the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. + erlc runner.erl erl -noshell -pa ../src/couchdb -pa ../src/mochiweb -eval "runner:run()" |