clwiki 2.4.0 → 3.0.0

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/x7/x7iSOdqAIVmVpn9ujTwJ_C7EqUgmMSri5vjjHdRIX10.cache

@@ -0,0 +1 @@
+"%A��G�{h t�l�m�V���NE���f���

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/xx/xxkulLgT-tkVeDC50gUXRGGMou47BUdlYOwgs0j5muY.cache

@@ -0,0 +1 @@
+I"
}app/assets/config/manifest.js?type=application/javascript&id=c185c2d67a408263950db37e2f40d29e4a4a4ef04dcfd599774b455fba0b788d:ET

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/yn/yn_3aZZwyjcI0O6fwisZ7zvcu4Gq5bV31g3tHFxfQNg.cache

@@ -0,0 +1 @@
+I"
�/Users/chrismo/modev/clwiki/app/assets/stylesheets/cl_wiki/application.css?type=application/css-sourcemap+json&id=b10dfcd8d20b581a407e709919f26b8ace23408349cbd1e3de5964bedb4774b5:ET

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/z9/z9HQmzff5j_6CFyk6eQ52nYt9cPLXsxDQY0Yep1Hz-0.cache

@@ -0,0 +1 @@
+"%/{CB�\��NX�j�r�\��W�ͨe[.i�

data/test/dummy/tmp/testrep/BazQuux.txt

@@ -0,0 +1,5 @@
+mtime: 2020-01-24 00:14:24 -0600
+owner: testy
+
+
+Describe BazQuux here.

data/test/dummy/tmp/testrep/FooBar.txt

@@ -0,0 +1,5 @@
+mtime: 2020-01-24 00:14:24 -0600
+owner: testy
+
+
+Describe FooBar here.

data/test/dummy/tmp/testrep/NewPage.txt

@@ -0,0 +1,5 @@
+mtime: 2020-01-12 00:30:57 -0600
+owner: testy
+
+
+Describe NewPage here.

data/test/dummy/tmp/testrep/users/testy.json

@@ -0,0 +1 @@
+{"username":"testy","password_digest":"$2a$04$Y1GNZ7KYtFnV8CcMcxPV3uVzRNwDbyBr4GSmG/ZwrgxX4I5rCKIvO"}

data/test/dummy/tmp/wikirep/FrontPage.txt

@@ -0,0 +1,5 @@
+mtime: 2020-01-23 23:40:04 -0600
+owner: chrismo
+
+
+Describe FrontPage here.

data/test/dummy/tmp/wikirep/users/chrismo.json

@@ -0,0 +1 @@
+{"username":"chrismo","password_digest":"$2a$12$QQD1dTnd5dFNCWRxLqJyBumrR2HmGPr44V4Z5cC0JhKYEtVKY.T3K"}

data/test/dummy/wikirep/FrontPage.txt

@@ -1,6 +1,7 @@
-mtime: 2013-01-26 23:22:47 -0600
-
-
+mtime: 2020-01-09 00:15:40 -0600
+owner: chrismo
+
+
 content aabbcc
 
 ChrisMorris
@@ -11,4 +12,10 @@ PreTagsTest
 
 AboutClWiki
 
-partial page hit => FooBa
+partial page hit => FooBa
+
+partial page hit (single result) => DotTe
+
+EncryptedPage
+
+edit

data/test/dummy/wikirep/users/chrismo.json

@@ -0,0 +1 @@
+{"username":"chrismo","password_digest":"$2a$12$QQD1dTnd5dFNCWRxLqJyBumrR2HmGPr44V4Z5cC0JhKYEtVKY.T3K"}

data/test/helpers/wiki_helper_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class WikiHelperTest < ActionView::TestCase

data/test/lib/clwiki/clwiki_test_helper.rb

@@ -1,5 +1,22 @@
-$LOAD_PATH << File.dirname(__FILE__) + '/../../../lib/cl_wiki'
+# frozen_string_literal: true
 
-require_relative 'test_base'
+require_relative '../../../lib/cl_wiki_lib'
+require File.expand_path('test_base', __dir__)
 
 require 'minitest/autorun'
+
+class EncryptingUser < ClWiki::UserBase
+  attr_reader :name
+
+  def initialize(name = 'encrypting test user')
+    @name = name
+  end
+
+  def can_encrypt?
+    true
+  end
+
+  def encryption_key
+    '0' * 64
+  end
+end

data/test/lib/clwiki/file_owner_test.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require_relative 'clwiki_test_helper'
+
+class FileOwnerTest < TestBase
+  def test_defaults_to_public_owner
+    file = ClWiki::File.new('PublicPage', @test_wiki_path)
+    assert file.owner.is_a? ClWiki::PublicUser
+  end
+
+  def test_public_owner_cannot_encrypt
+    file = ClWiki::File.new('PublicPage', @test_wiki_path)
+    assert_raises { file.encrypt_content! }
+  end
+
+  def test_real_user_can_encrypt
+    user = EncryptingUser.new
+    file = ClWiki::File.new('UserPage', @test_wiki_path, owner: user)
+    file.encrypt_content!
+    file.content = 'My Encrypted Content'
+
+    read_contents = ::File.read(file.full_path_and_name, mode: 'rb')
+    refute(/Encrypted/.match?(read_contents))
+
+    read_file = ClWiki::File.new('UserPage', @test_wiki_path, owner: user)
+    assert_equal 'My Encrypted Content', read_file.content
+  end
+
+  def test_different_owner_cannot_read
+    foo = EncryptingUser.new('foo')
+    bar = EncryptingUser.new('bar')
+
+    ClWiki::File.new('FooPage', @test_wiki_path, owner: foo)
+
+    assert_raises do
+      ClWiki::File.new('FooPage', @test_wiki_path, owner: bar)
+    end
+  end
+
+  def test_no_owner_metadata_defaults_to_public
+    create_legacy_file('LegacyPage.txt')
+    file = ClWiki::File.new('LegacyPage', @test_wiki_path)
+    assert_equal 'public', file.owner.name
+  end
+
+  def test_no_owner_metadata_but_encrypted_raises
+    # if there is no owner, BUT file is set to encrypt -
+    # well ... this would fail naturally ... right?
+  end
+
+  def test_public_page_not_encrypted_accessible_by_anyone
+    create_legacy_file('LegacyPage.txt')
+    user = EncryptingUser.new
+
+    file = ClWiki::File.new('LegacyPage', @test_wiki_path, owner: user)
+    assert_equal user.name, file.owner.name
+  end
+end

data/test/lib/clwiki/file_test.rb

@@ -1,93 +1,94 @@
+# frozen_string_literal: true
+
 require_relative 'clwiki_test_helper'
-require 'file'
 
-class TestClWikiFile < TestBase
+class ClWikiFileTest < TestBase
   # refactor: shouldn't be dealing with page paths at this level, should be at
   # the ClWikiPage level
-  def do_test_new_page(fullPageName)
-    fullPageName = ClWiki::Util.convertToNativePath(fullPageName)
-    fileName = File.expand_path(File.join(@test_wiki_path, fullPageName)) + '.txt'
-    File.delete(fileName) if FileTest.exist?(fileName)
-    wikiFile = ClWiki::File.new(fullPageName, @test_wiki_path)
-    assert(FileTest.exist?(wikiFile.fullPathAndName))
-    pagePath, pageName = File.split(fullPageName)
-    assert(wikiFile.name == pageName)
-    assert_equal(pagePath, wikiFile.pagePath)
-    assert(wikiFile.wikiRootPath == @test_wiki_path)
-    assert_equal(fileName, wikiFile.fullPathAndName)
-    assert_equal(["Describe " + pageName + " here."], wikiFile.content)
-    newWikiFile = ClWiki::File.new(fullPageName, @test_wiki_path)
-    assert_equal(["Describe " + pageName + " here."], newWikiFile.content)
+  def do_test_new_page(full_page_name)
+    full_page_name = ClWiki::Util.convert_to_native_path(full_page_name)
+    file_name = File.expand_path(File.join(@test_wiki_path, full_page_name)) + '.txt'
+    File.delete(file_name) if FileTest.exist?(file_name)
+    wiki_file = ClWiki::File.new(full_page_name, @test_wiki_path)
+    assert(FileTest.exist?(wiki_file.full_path_and_name))
+    _, page_name = File.split(full_page_name)
+    assert(wiki_file.name == page_name)
+    assert_equal(file_name, wiki_file.full_path_and_name)
+    assert_equal("Describe #{page_name} here.", wiki_file.content)
+    new_wiki_file = ClWiki::File.new(full_page_name, @test_wiki_path)
+    assert_equal("Describe #{page_name} here.", new_wiki_file.content)
   end
 
   def test_new_root_page
     do_test_new_page('/NewPage')
   end
 
-  def test_new_sub_page_forward_slash
-    do_test_new_page('/NewPage/NewSubPage')
-  end
-
-  def test_new_sub_page_back_slash
-    do_test_new_page("\\NewPage\\NewSubPage")
+  def test_file_delete
+    file = ClWiki::File.new('NewPage', @test_wiki_path)
+    assert file.file_exists?
+    file.delete
+    refute file.file_exists?
   end
 
   def test_update_page
-    wikiFile = ClWiki::File.new("/UpdatePage", @test_wiki_path)
-    assert_equal(["Describe UpdatePage here."], wikiFile.content)
+    wiki_file = ClWiki::File.new('/UpdatePage', @test_wiki_path)
+    assert_equal('Describe UpdatePage here.', wiki_file.content)
 
     # this test looks ridiculous, but ClWiki::File actually does a write to disk
     # and re-read from the file behind the scenes here.
     # refactor rename?
-    wikiFile.content = "This is new content."
-    assert_equal(["This is new content."], wikiFile.content)
+    wiki_file.content = 'This is new content.'
+    assert_equal('This is new content.', wiki_file.content)
   end
 
+  # rubocop:disable Lint/SuppressedException
   def test_multi_user_edit
     # this can happen if 2 people load a page, then both edit the page - the last one
     # to submit would stomp the first edit ... unless:
-    wiki_file_a = ClWiki::File.new("/UpdatePage", @test_wiki_path)
-    wiki_file_b = ClWiki::File.new("/UpdatePage", @test_wiki_path)
-    assert_equal(["Describe UpdatePage here."], wiki_file_a.content)
-    assert_equal(["Describe UpdatePage here."], wiki_file_b.content)
+    wiki_file_a = ClWiki::File.new('/UpdatePage', @test_wiki_path)
+    wiki_file_b = ClWiki::File.new('/UpdatePage', @test_wiki_path)
+    assert_equal('Describe UpdatePage here.', wiki_file_a.content)
+    assert_equal('Describe UpdatePage here.', wiki_file_b.content)
 
     sleep 2.5 # to ensure mtime changes. (lesser time sometimes doesn't work)
-    wiki_file_a.content = "This is new A content."
+    wiki_file_a.content = 'This is new A content.'
     begin
-      wiki_file_b.content = "This is new B content."
-      assert(false, "Expected exception did not occur.")
+      wiki_file_b.content = 'This is new B content.'
+      assert(false, 'Expected exception did not occur.')
     rescue ClWiki::FileModifiedSinceRead
       # don do anythain, issa wha shoo 'appen
     end
 
-    wiki_file_b.readFile
-    assert_equal(["This is new A content."], wiki_file_b.content)
+    wiki_file_b.read_file
+    assert_equal('This is new A content.', wiki_file_b.content)
   end
+  # rubocop:enable Lint/SuppressedException
 
   def test_multi_user_edit_dst
     # running into a problem where I can't edit a page that was last edited outside
     # of DST when I'm in DST ... it raises ClWiki::FileModifiedSinceRead
-    wiki_file = ClWiki::File.new("/UpdateDstPage", @test_wiki_path)
+    wiki_file = ClWiki::File.new('/UpdateDstPage', @test_wiki_path)
     def wiki_file.ding_mtime
       @metadata['mtime'] = Time.local(2011, 'jan', 1)
     end
     wiki_file.content = 'New content'
 
-    wiki_file_read = ClWiki::File.new("/UpdateDstPage", @test_wiki_path)
+    wiki_file_read = ClWiki::File.new('/UpdateDstPage', @test_wiki_path)
     def wiki_file_read.ding_mtime
       @metadata['mtime'] = Time.local(2011, 'jun', 1)
     end
-    wiki_file_read.content = "This is new A content."
-    assert_equal(["This is new A content."], wiki_file_read.content)
+    wiki_file_read.content = 'This is new A content.'
+    assert_equal('This is new A content.', wiki_file_read.content)
   end
 
   def test_mtime_metadata
     # the mtime of the file can be optionally stored as meta data at the top of the file
-    wiki_file = ClWiki::File.new("/PageWithMetaData", @test_wiki_path)
-    file_lines = File.readlines(wiki_file.fullPathAndName)
+    wiki_file = ClWiki::File.new('/PageWithMetaData', @test_wiki_path)
+    file_lines = File.readlines(wiki_file.full_path_and_name)
     assert_match(/^mtime: .+$/, file_lines[0])
-    assert_equal "\n", file_lines[1]
+    assert_match(/^owner: .+$/, file_lines[1])
     assert_equal "\n", file_lines[2]
+    assert_equal "\n", file_lines[3]
   end
 
   def test_compare_ignores_usec
@@ -101,24 +102,52 @@ class TestClWikiFile < TestBase
 
   def test_reads_no_metadata_file
     File.open(File.join(@test_wiki_path, 'LegacyPage.txt'), 'w') do |f|
-      f.puts "First line"
+      f.puts 'First line'
       f.puts "\n\n"
-      f.puts "After the big break"
+      f.puts 'After the big break'
     end
-    wiki_file = ClWiki::File.new("/LegacyPage", @test_wiki_path)
-    assert_equal "First line\n\n\nAfter the big break\n", wiki_file.content.join
-    assert_equal({}, wiki_file.metadata)
+    wiki_file = ClWiki::File.new('/LegacyPage', @test_wiki_path)
+    assert_equal "First line\n\n\nAfter the big break\n", wiki_file.content
+    assert_equal({}, wiki_file.metadata.to_h)
   end
 
   def test_mid_mtime_not_parsed_as_metadata
-    File.open(File.join(@test_wiki_path, 'LegacyPage.txt'), 'w') do |f|
-      f.puts "a"
-      f.puts "mtime: 2015-09-22"
-      f.puts "\n\n"
-      f.puts "b"
-    end
-    wiki_file = ClWiki::File.new("/LegacyPage", @test_wiki_path)
-    assert_equal "a\nmtime: 2015-09-22\n\n\nb\n", wiki_file.content.join
-    assert_equal({}, wiki_file.metadata)
+    contents = [
+      'a',
+      'mtime: 2015-09-22',
+      "\n",
+      'b',
+    ].join("\n")
+    create_legacy_file('LegacyPage.txt', contents)
+
+    wiki_file = ClWiki::File.new('/LegacyPage', @test_wiki_path)
+    assert_equal "a\nmtime: 2015-09-22\n\n\nb\n", wiki_file.content
+    assert_equal({}, wiki_file.metadata.to_h)
+  end
+
+  def test_encrypted_contents
+    wiki_file = ClWiki::File.new('/EncryptedPage', @test_wiki_path, owner: EncryptingUser.new)
+    wiki_file.encrypt_content!
+    expected_content = "This is my\n<b>awesome</b>\ncontent!"
+    wiki_file.content = expected_content
+
+    refute_match(/awesome/, ::File.read(wiki_file.full_path_and_name, mode: 'rb'))
+
+    read_file = ClWiki::File.new('/EncryptedPage', @test_wiki_path, owner: EncryptingUser.new)
+    assert_equal expected_content, read_file.content
+  end
+
+  def test_decrypt_contents
+    wiki_file = ClWiki::File.new('/ToBeDecryptedPage', @test_wiki_path, owner: EncryptingUser.new)
+    wiki_file.encrypt_content!
+    expected_content = "This is my\n<b>awesome</b>\ncontent!"
+    wiki_file.content = expected_content
+
+    refute_match(/awesome/, ::File.read(wiki_file.full_path_and_name, mode: 'rb'))
+
+    wiki_file.do_not_encrypt_content!
+    wiki_file.content = expected_content
+
+    assert_match(/awesome/, ::File.read(wiki_file.full_path_and_name, mode: 'rb'))
   end
 end

data/test/lib/clwiki/memory_index_test.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require_relative 'clwiki_test_helper'
+
+class MemoryIndexTest < TestBase
+  def test_with_same_mod_timestamp
+    file_a = create_legacy_file('TestFileA.txt')
+    file_b = create_legacy_file('TestFileB.txt')
+    file_c = create_legacy_file('TestFileC.txt')
+    # couldn't find a way to set the mtime quickly, so just trusting
+    # the above code will run within the same second...
+    assert_in_delta(File.mtime(file_a), File.mtime(file_b), 1)
+    assert_in_delta(File.mtime(file_a), File.mtime(file_c), 1)
+    index = ClWiki::MemoryIndexer.new
+    recent = index.recent
+    assert_equal(%w[TestFileA TestFileB TestFileC], recent.sort)
+  end
+
+  def test_search
+    terms = %w[foo bar qux thud]
+    create_legacy_file('TestFileA.txt', terms[0..1])
+    create_legacy_file('TestFileB.txt', terms[1..2])
+    create_legacy_file('TestFileC.txt', terms[2..3])
+    index = ClWiki::MemoryIndexer.new
+    assert_equal %w[TestFileB TestFileC], index.search('qux').flatten
+  end
+
+  def test_search_titles_only
+    terms = %w[foo bar qux thud]
+    create_legacy_file('FooPage.txt', terms[0..1])
+    create_legacy_file('BarPage.txt', terms[1..2])
+    create_legacy_file('QuxPage.txt', terms[2..3])
+    index = ClWiki::MemoryIndexer.new
+    assert_equal %w[QuxPage], index.search('qu', titles_only: true)
+    assert_equal %w[BarPage QuxPage], index.search('qu', titles_only: false)
+  end
+
+  def test_page_exists
+    create_legacy_file('TestFileA.txt')
+    index = ClWiki::MemoryIndexer.new
+    assert index.page_exists?('TestFileA')
+    refute index.page_exists?('TestFileB')
+  end
+
+  def test_reindex
+    create_legacy_file('FileToReindex.txt', 'foo bar')
+    index = ClWiki::MemoryIndexer.new
+    file = ClWiki::File.new('FileToReindex', @test_wiki_path)
+    file.content = 'bar qux'
+    index.reindex_page('FileToReindex')
+    assert_equal %w[FileToReindex], index.search('qux').flatten
+  end
+
+  def test_recent_with_search
+    create_legacy_file('TestFileA.txt', 'foo')
+    create_legacy_file('TestFileB.txt', 'bar')
+    create_legacy_file('TestFileC.txt', 'qux')
+    index = ClWiki::MemoryIndexer.new
+    assert_equal %w[TestFileB], index.recent(3, text: 'bar')
+  end
+end

data/test/lib/clwiki/page_test.rb

@@ -1,115 +1,60 @@
+# frozen_string_literal: true
+
 require_relative 'clwiki_test_helper'
-require 'page'
 require 'tmpdir'
 
 # stub this out for testing
 class ClWiki::Page
-  @@page_exists = false
-  @@page_globally_exists = false
+  @page_exists = false
+  @page_globally_exists = false
 
   def self.set_page_exists(value)
-    @@page_exists = value
+    @page_exists = value
   end
 
-  def self.page_exists?(pageFullName)
-    @@page_exists
+  def self.page_exists?(_)
+    @page_exists
   end
 end
 
-class TestClWikiPage < TestBase
+class PageTest < TestBase
   def test_wiki_page
-    ClWiki::Page.new('/NewPage')
-  end
-
-  def do_test_convert_to_link(pageName, pagePath='/FrontPage')
-    f = ClWiki::PageFormatter.new(nil, pagePath)
-    # fullPageName = f.expand_path(pageName, pagePath)
-    ClWiki::Page.set_page_exists(false)
-    $wiki_conf.editable = true
-    assert_equal(
-      pageName + "<a href='#{pageName}/edit'>?</a>",
-      f.convertToLink(pageName))
-    $wiki_conf.editable = false
-    assert_equal(
-      pageName,
-      f.convertToLink(pageName))
-    ClWiki::Page.set_page_exists(true)
-
-    # now that links serve up a separate link for each page in the
-    # hierarchy, testing this is cumbersome - and there's already
-    # tests for testFormatLinkPages which exercise this same thing
-
-    # assert_equal(
-    #  "<a href=clwikicgi.rb?page=" + fullPageName + ">" + pageName + "</a>",
-    #   f.convertToLink(pageName))
-  end
-
-  def test_convert_to_link_main
-    do_test_convert_to_link("TestPage")
-  end
-
-  def test_convert_to_link_sub_bs
-    do_test_convert_to_link("TestPage\TestSubPage")
-  end
-
-  def test_convert_to_link_sub_fs
-    do_test_convert_to_link("TestPage/TestSubPage")
-  end
-
-  def test_convert_to_link_bs_sub
-    do_test_convert_to_link("\TestPage/TestSubPage")
-  end
-
-  def test_convert_to_link_fs_sub
-    do_test_convert_to_link("/TestPage/TestSubPage")
-  end
-
-  def test_convert_to_link_fs_sub_sub
-    do_test_convert_to_link("/TestPage/TestSubPage\NotherSubPage")
-  end
-
-  def test_convert_to_link_fs_sub_sub2
-    do_test_convert_to_link("/TestPage/TestSubPage/NotherSubPage")
-  end
-
-  def test_convert_to_link_collapse_path
-    do_test_convert_to_link("TestSubPage/NotherSubPage", "/TestPage/TestSubPage")
-    do_test_convert_to_link("SubPage/NotherSubPage", "/TestPage/SubPage/SubPage")
+    ClWiki::Page.new('NewPage')
   end
 
   def test_gsub_words
     original =
-        'test page PageName ' +
-            'PageName/SubPage PageName\SubPage\SubPage ' +
-            '/PageName/SubPage \PageName\SubPage\SubPage ' +
-            'test.thing test, <tagger> </tagger> oops>whoops ' +
-            'oops<thing>bleh hen<butter '
+      'test page PageName ' \
+      'PageName/SubPage PageName\SubPage\SubPage ' \
+      '/PageName/SubPage \PageName\SubPage\SubPage ' \
+      'test.thing test, <tagger> </tagger> oops>whoops ' \
+      'oops<thing>bleh hen<butter '
 
     expected_results =
-        %w(test page PageName
-           PageName SubPage PageName SubPage SubPage PageName SubPage PageName SubPage SubPage
-           test thing test <tagger> </tagger> oops whoops
-           oops <thing> bleh hen butter)
+      %w[test page PageName
+         PageName SubPage PageName SubPage SubPage PageName SubPage PageName SubPage SubPage
+         test thing test <tagger> </tagger> oops whoops
+         oops <thing> bleh hen butter]
 
-    actual_results = Array.new
+    actual_results = []
     f = ClWiki::PageFormatter.new(original)
-    f.gsubWords { |word| actual_results << word }
+    f.gsub_words { |word| actual_results << word }
     assert_equal(expected_results, actual_results)
   end
 
-  def do_test_format_links(content, expected_content, page_exists=true)
+  def do_test_format_links(content, expected_content, page_exists = true)
     $wiki_conf.editable = true
     f = ClWiki::PageFormatter.new(content, nil)
     ClWiki::Page.set_page_exists(page_exists)
-    assert_equal(expected_content, f.formatLinks, "content: #{content} page_exists: #{page_exists} editable")
+    assert_equal(expected_content, f.format_links, "content: #{content} page_exists: #{page_exists} editable")
 
     $wiki_conf.editable = false
     f = ClWiki::PageFormatter.new(content, nil)
     ClWiki::Page.set_page_exists(page_exists)
     if page_exists
-      assert_equal(expected_content, f.formatLinks, "content: #{content} page_exists: #{page_exists} not editable")
+      assert_equal(expected_content, f.format_links, "content: #{content} page_exists: #{page_exists} not editable")
     else
-      assert_equal(content, f.formatLinks, "content: #{content} page_exists: #{page_exists} not editable")
+      assert_equal(content, f.format_links, "content: #{content} page_exists: #{page_exists} not editable")
     end
   end
 
@@ -126,7 +71,7 @@ class TestClWikiPage < TestBase
     # are returned intact. IE 5 just ignores them.
     # In the future I need to code no wiki links within
     # brackets which means parsing them.
-    do_test_format_links('<NoWikiLinks>TestPage</NoWikiLinks>', "TestPage")
+    do_test_format_links('<NoWikiLinks>TestPage</NoWikiLinks>', 'TestPage')
 
     # No WikiLinks within < >, to avoid problems with href
     do_test_format_links('<a href="www.NotAWikiPage.com">some link</a>', '<a href="www.NotAWikiPage.com">some link</a>')
@@ -139,24 +84,24 @@ class TestClWikiPage < TestBase
 
   def test_is_wiki_name
     f = ClWiki::PageFormatter.new
-    assert(f.is_wiki_name?("WikiName"))
-    assert(!f.is_wiki_name?("WikiName,"))
-    assert(!f.is_wiki_name?("Wikiname"))
-    assert(!f.is_wiki_name?("wIkiName"))
-    assert(!f.is_wiki_name?("<h1>wikiName</h1><br>Other"))
-    assert(!f.is_wiki_name?("<WikiName>"))
-    assert(!f.is_wiki_name?("WIKI"))
-    assert(f.is_wiki_name?('WikiName/SubWikiName'))
-    assert(f.is_wiki_name?('WikiName\SubWikiName'))
-    assert(f.is_wiki_name?('/WikiName/SubWikiName'))
-    assert(!f.is_wiki_name?('./WikiName/SubWikiName'))
-    assert(!f.is_wiki_name?('/.WikiName/SubWikiName'))
-    assert(!f.is_wiki_name?('/Wiki.Name/SubWikiName'))
-    assert(!f.is_wiki_name?('WikiName/Notwikiname'))
-    assert(!f.is_wiki_name?('Notwikiname/WikiName'))
-    assert(!f.is_wiki_name?('WikiName/WikiName/Notwikiname'))
-    assert(!f.is_wiki_name?('/'))
-    assert(!f.is_wiki_name?('//'))
+    assert(f.is_wiki_name?('WikiName'))
+    assert(f.is_wiki_name?('YoYo'))
+    refute(f.is_wiki_name?('Wikiname'))
+    refute(f.is_wiki_name?('wIkiName'))
+    refute(f.is_wiki_name?('<h1>wikiName</h1><br>Other'))
+    refute(f.is_wiki_name?('<WikiName>'))
+    refute(f.is_wiki_name?('WIKI'))
+    refute(f.is_wiki_name?('WikiName/SubWikiName'))
+    refute(f.is_wiki_name?('WikiName\SubWikiName'))
+    refute(f.is_wiki_name?('/WikiName/SubWikiName'))
+    refute(f.is_wiki_name?('./WikiName/SubWikiName'))
+    refute(f.is_wiki_name?('/.WikiName/SubWikiName'))
+    refute(f.is_wiki_name?('/Wiki.Name/SubWikiName'))
+    refute(f.is_wiki_name?('WikiName/Notwikiname'))
+    refute(f.is_wiki_name?('Notwikiname/WikiName'))
+    refute(f.is_wiki_name?('WikiName/WikiName/Notwikiname'))
+    refute(f.is_wiki_name?('/'))
+    refute(f.is_wiki_name?('//'))
   end
 
   def test_custom_formatter
@@ -167,10 +112,9 @@ class TestClWikiPage < TestBase
 
   def test_custom_formatter_path_config
     Dir.mktmpdir do |dir|
-      begin
-        $wiki_conf.custom_formatter_load_path << dir
-        File.open(File.join(dir, 'format.reverser.rb'), 'w') do |f|
-          f.print <<-RUBY
+      $wiki_conf.custom_formatter_load_path << dir
+      File.open(File.join(dir, 'format.reverser.rb'), 'w') do |f|
+        f.print <<-RUBY
           class ReverseText < ClWiki::CustomFormatter
             def ReverseText.match_re
               /.*/
@@ -184,62 +128,41 @@ class TestClWikiPage < TestBase
           end
 
           ClWiki::CustomFormatters.instance.register(ReverseText)
-          RUBY
-        end
-        page = ClWiki::Page.new('RevPage')
-        page.update_content("awesome", page.mtime)
-        assert_match(/emosewa/, page.read_content(false))
-      ensure
-        ClWiki::CustomFormatters.instance.unregister(ReverseText)
-        Object.send(:remove_const, :ReverseText)
-        $wiki_conf.custom_formatter_load_path.delete(dir)
+        RUBY
       end
+      page = ClWiki::Page.new('RevPage')
+      page.update_content('awesome', page.mtime)
+      assert_match(/emosewa/, page.read_content(false))
+    ensure
+      ClWiki::CustomFormatters.instance.unregister(ReverseText)
+      Object.send(:remove_const, :ReverseText)
+      $wiki_conf.custom_formatter_load_path.delete(dir)
     end
   end
+
+  def test_encrypted_content
+    page = ClWiki::Page.new('NewEncryptedPage', wiki_path: @test_wiki_path, owner: EncryptingUser.new)
+    page.update_content('my new content', Time.now, true)
+    assert_match(/my new content/, page.read_content(false))
+    refute_match(/new content/, File.read(page.file_full_path_and_name, mode: 'rb'))
+  end
 end
 
 class TestClWikiPageFormatter < TestBase
   def test_only_html
     assert(ClWiki::PageFormatter.only_html('<tag>'))
-    assert(!ClWiki::PageFormatter.only_html('<tag'))
-    assert(!ClWiki::PageFormatter.only_html('tag>'))
-    assert(!ClWiki::PageFormatter.only_html('tag'))
-    assert(!ClWiki::PageFormatter.only_html(''))
-    assert(!ClWiki::PageFormatter.only_html('  '))
+    refute(ClWiki::PageFormatter.only_html('<tag'))
+    refute(ClWiki::PageFormatter.only_html('tag>'))
+    refute(ClWiki::PageFormatter.only_html('tag'))
+    refute(ClWiki::PageFormatter.only_html(''))
+    refute(ClWiki::PageFormatter.only_html('  '))
     assert(ClWiki::PageFormatter.only_html('  < t a g >  '))
-    assert(!ClWiki::PageFormatter.only_html('<t>a<g>'))
+    refute(ClWiki::PageFormatter.only_html('<t>a<g>'))
 
     # if this passes, method is misnamed, now
-    assert( ClWiki::PageFormatter.only_html('<h1>a</h1>'))
-    assert( ClWiki::PageFormatter.only_html(' <h5> a </h5>  '))
-    assert( ClWiki::PageFormatter.only_html(' <h5> <a href> </h5>  '))
-    assert(!ClWiki::PageFormatter.only_html(' <h5> <a href> </h5> stuff '))
-  end
-end
-
-class TestGlobalHitReducer < TestBase
-  def test_global_hit_reducer
-    # for global links, we want matches to be limited to exact matches.
-    # If //RootPage/SubPage has seven children:
-    #
-    #   //RootPage/SubPage/ChildOne
-    #   //RootPage/SubPage/ChildTwo
-    #   ...
-    #
-    # and the content is SubPage, we don't want a global link to the
-    # find results of SubPage, but a direct link to //RootPage/SubPage.
-    # If there's also a //OtherPage/SubPage, then the global link in this
-    # case will still go to Find Results.
-
-    hits = ['//RootPage/SubPage', '//RootPage/SubPage/ChildOne']
-    reduced = ClWiki::GlobalHitReducer.reduce_to_exact_if_exists('SubPage', hits)
-    assert_equal(['//RootPage/SubPage'], reduced)
-
-    reduced = ClWiki::GlobalHitReducer.reduce_to_exact_if_exists('SubPa', hits)
-    assert_equal(hits, reduced)
-
-    hits = ['//RootPage/SubPage', '//OtherPage/SubPage']
-    reduced = ClWiki::GlobalHitReducer.reduce_to_exact_if_exists('SubPage', hits)
-    assert_equal(hits, reduced)
+    assert(ClWiki::PageFormatter.only_html('<h1>a</h1>'))
+    assert(ClWiki::PageFormatter.only_html(' <h5> a </h5>  '))
+    assert(ClWiki::PageFormatter.only_html(' <h5> <a href> </h5>  '))
+    refute(ClWiki::PageFormatter.only_html(' <h5> <a href> </h5> stuff '))
   end
 end