Fix tests and unfortunate captcha dir name choice.

diff --git a/README.md b/README.md
index c1d9f4b6c751e3d3d92b7864830328fafab0043f..88573aa86b98909bb93efa9df4d180c3d727f7f6 100644 (file)
--- a/README.md
+++ b/README.md
@@ -33,9 +33,9 @@ these links will be added as article-specific linkbacks to the .html file and
 the feed entry.
 
 Just like the .links files, article-specific files containing captcha data are
-created and can be edited in ./captchas/. The first line of such a file is meant
-as a captcha, and the second line as its description, which may be inserted via
-templating into the article HTML file.
+created and can be edited in ./captchas/linkable/. The first line of such a file
+is meant as a captcha, and the second line as its description, which may be
+inserted via templating into the article HTML file.
 
 Some metadata files will also be generated below ./metadata/: For each article,
 there will be generated a .automatic_metadata (to contain an article's UUID,

diff --git a/processor/default.html.do b/processor/default.html.do
index 31fa9cd5e24259401c9ff0332eae1639f95c8648..8e88dbb86ca4bbbcf55e1dfb250a417289e9b912 100644 (file)
--- a/processor/default.html.do
+++ b/processor/default.html.do
@@ -10,7 +10,7 @@ prep_url() {
 # Pull in global dependencies.
 . ./helpers.sh
 metadata_dir=metadata
-captchas_dir=captchas/public
+captchas_dir=captchas/linkable
 mkdir -p "$captchas_dir"
 meta_file="${metadata_dir}/${1%.html}.automatic_metadata"
 redo-ifchange "$meta_file"

diff --git a/test/test_files/captchas/bar baz b/test/test_files/captchas/bar baz
deleted file mode 100644 (file)
index 42bf241..0000000
--- a/test/test_files/captchas/bar baz
+++ /dev/null
@@ -1,2 +0,0 @@
-apple
-apple
\ No newline at end of file

diff --git a/test/test_files/captchas/foo b/test/test_files/captchas/foo
deleted file mode 100644 (file)
index 42bf241..0000000
--- a/test/test_files/captchas/foo
+++ /dev/null
@@ -1,2 +0,0 @@
-apple
-apple
\ No newline at end of file

diff --git a/test/test_files/captchas/linkable/bar baz b/test/test_files/captchas/linkable/bar baz
new file mode 100644 (file)
index 0000000..42bf241
--- /dev/null
+++ b/test/test_files/captchas/linkable/bar baz
@@ -0,0 +1,2 @@
+apple
+apple
\ No newline at end of file

diff --git a/test/test_files/captchas/linkable/foo b/test/test_files/captchas/linkable/foo
new file mode 100644 (file)
index 0000000..42bf241
--- /dev/null
+++ b/test/test_files/captchas/linkable/foo
@@ -0,0 +1,2 @@
+apple
+apple
\ No newline at end of file

diff --git a/test/test_files/captchas/linkable/te"st b/test/test_files/captchas/linkable/te"st
new file mode 100644 (file)
index 0000000..42bf241
--- /dev/null
+++ b/test/test_files/captchas/linkable/te"st
@@ -0,0 +1,2 @@
+apple
+apple
\ No newline at end of file

diff --git a/test/test_files/captchas/te"st b/test/test_files/captchas/te"st
deleted file mode 100644 (file)
index 42bf241..0000000
--- a/test/test_files/captchas/te"st
+++ /dev/null
@@ -1,2 +0,0 @@
-apple
-apple
\ No newline at end of file