glyph 0.5.2 → 0.5.3.1

data/spec/macros/core_spec.rb

@@ -16,73 +16,73 @@ describe "Macro:" do
 	it "snippet" do
 		define_em_macro
 		interpret "&:[test|This is a \nTest snippet]Testing a snippet: &[test]."
-		@p.document.output.should == "Testing a snippet: This is a \nTest snippet."
+		expect(@p.document.output).to eq("Testing a snippet: This is a \nTest snippet.")
 		interpret("Testing &[wrong].")
-		@p.document.output.should == "Testing [SNIPPET 'wrong' NOT PROCESSED]." 
+		expect(@p.document.output).to eq("Testing [SNIPPET 'wrong' NOT PROCESSED].") 
 		text = "&:[b|and another em[test]]&:[a|this is a em[test] &[b]]TEST: &[a]"
 		interpret text
-		@p.document.output.should == "TEST: this is a <em>test</em> and another <em>test</em>"
+		expect(@p.document.output).to eq("TEST: this is a <em>test</em> and another <em>test</em>")
 		# Check snippets with links
 		text = "&:[c|This is a link to something afterwards: =>[#other]]Test. &[c]. #[other|Test]."
-		output_for(text).should == %{Test. This is a link to something afterwards: <a href="#other">Test</a>. <a id="other">Test</a>.}
+		expect(output_for(text)).to eq(%{Test. This is a link to something afterwards: <a href="#other">Test</a>. <a id="other">Test</a>.})
 	end
 
 	it "snippet:" do
 		interpret("&[t1] - &:[t1|Test #1] - &[t1]")
-		@p.document.output.should == "[SNIPPET 't1' NOT PROCESSED] -  - Test #1"
-		@p.document.snippet?(:t1).should == "Test #1"
+		expect(@p.document.output).to eq("[SNIPPET 't1' NOT PROCESSED] -  - Test #1")
+		expect(@p.document.snippet?(:t1)).to eq("Test #1")
 	end
 
 	it "condition" do
 		define_em_macro
 		interpret("?[$[document.invalid]|em[test]]")
-		@p.document.output.should == ""
+		expect(@p.document.output).to eq("")
 		interpret("?[$[document.output]|em[test]]")
-		@p.document.output.should == "<em>test</em>"
+		expect(@p.document.output).to eq("<em>test</em>")
 		interpret("?[not[eq[$[document.output]|]]|em[test]]")
-		@p.document.output.should == "<em>test</em>"
+		expect(@p.document.output).to eq("<em>test</em>")
 		interpret %{?[
 				or[
 					eq[$[document.target]|htmls]|
 					not[eq[$[document.author]|x]]
 				]|em[test]]}
-		@p.document.output.should == "<em>test</em>"
+		expect(@p.document.output).to eq("<em>test</em>")
 		# "false" should be regarded as false
 		interpret(%{?[%["test".blank?]|---]})
-		@p.document.output.should == ""
+		expect(@p.document.output).to eq("")
 		interpret("?[not[match[$[document.source]|/^docu/]]|em[test]]")
-		@p.document.output.should == ""
+		expect(@p.document.output).to eq("")
 		interpret "?[%[lite?]|test]"
-		@p.document.output.should == ""
+		expect(@p.document.output).to eq("")
 		interpret "?[%[!lite?]|test]"
-		@p.document.output.should == "test"
+		expect(@p.document.output).to eq("test")
 		interpret "?[%[lite?]|%[\"test\"]]"
-		@p.document.output.should == ""
+		expect(@p.document.output).to eq("")
 		# Condition not satisfied...
 		interpret "?[%[lite?]|%[ Glyph\\['test_config'\\] = true ]]"
-		@p.document.output.should == ""
-		Glyph['test_config'].should_not == true
+		expect(@p.document.output).to eq("")
+		expect(Glyph['test_config']).not_to eq(true)
 		# Condition satisfied...
 		interpret "?[%[!lite?]|%[ Glyph\\['test_config'\\] = true ]]"
-		@p.document.output.should == "true"
-		Glyph['test_config'].should == true
+		expect(@p.document.output).to eq("true")
+		expect(Glyph['test_config']).to eq(true)
 	end
 
 	it "condition (else)" do
-		output_for("?[true|OK|NOT OK]").should == "OK"
-		output_for("?[false|OK|NOT OK]").should == "NOT OK"
+		expect(output_for("?[true|OK|NOT OK]")).to eq("OK")
+		expect(output_for("?[false|OK|NOT OK]")).to eq("NOT OK")
 	end
 
 	it "comment" do
-		output_for("--[config:[some_random_setting|test]]").should == ""
-		Glyph[:some_random_setting].should == nil
+		expect(output_for("--[config:[some_random_setting|test]]")).to eq("")
+		expect(Glyph[:some_random_setting]).to eq(nil)
 	end
 
 	it "include" do
 		Glyph["filters.by_extension"] = true
 		text = file_load(Glyph::PROJECT/'text/container.textile')
 		interpret text
-		@p.document.output.gsub(/\n|\t/, '').should == %{
+		expect(@p.document.output.gsub(/\n|\t/, '')).to eq(%{
 			<div class="section">
 			<h2 id="h_1" class="toc">Container section</h2>
 			This is a test.
@@ -91,7 +91,7 @@ describe "Macro:" do
 				<p>&#8230;</p>
 				</div>
 			</div>
-		}.gsub(/\n|\t/, '')
+		}.gsub(/\n|\t/, ''))
 	end
 
 	it "include should work in Lite mode" do
@@ -107,17 +107,17 @@ This is a test.
 </div>}.gsub(/\n|\t/, '')		
 		Dir.chdir Glyph::SPEC_DIR/"files"
 		text = file_load(Glyph::SPEC_DIR/"files/container.textile").gsub("a/b/c/", '')
-		Glyph.filter(text).gsub(/\n|\t/, '').should == result
+		expect(Glyph.filter(text).gsub(/\n|\t/, '')).to eq(result)
 		Dir.chdir Glyph::PROJECT
 		Glyph.lite_mode = false
 	end
 
 	it "include should assume .glyph as the default extension" do
 		file_copy Glyph::SPEC_DIR/'files/article.glyph', Glyph::PROJECT/'text/article.glyph'
-		output_for("include[article]").gsub(/\n|\t/, '').should == %{<div class="section">
+		expect(output_for("include[article]").gsub(/\n|\t/, '')).to eq(%{<div class="section">
 改善 Test -- Test Snippet
 
-</div>}.gsub(/\n|\t/, '')
+</div>}.gsub(/\n|\t/, ''))
 	end
 
 	it "include should evaluate .rb file in the context of Glyph" do
@@ -127,7 +127,7 @@ This is a test.
 			end
 		}
 		file_write Glyph::PROJECT/"lib/test.rb", text
-		output_for("include[test.rb]day[]").should == Time.now.day.to_s	
+		expect(output_for("include[test.rb]day[]")).to eq(Time.now.day.to_s)	
 	end
 
 	it "load" do
@@ -135,9 +135,9 @@ This is a test.
 		text2 = %{Time.now.day}
 		file_write Glyph::PROJECT/"test1.glyph", text1
 		file_write Glyph::PROJECT/"test2.rb", text2
-		output_for("load[test/test1.glyph]").should == "[FILE 'test/test1.glyph' NOT FOUND]"
-		output_for("load[test1.glyph]").should == text1
-		output_for("load[test2.rb]").should == text2
+		expect(output_for("load[test/test1.glyph]")).to eq("[FILE 'test/test1.glyph' NOT FOUND]")
+		expect(output_for("load[test1.glyph]")).to eq(text1)
+		expect(output_for("load[test2.rb]")).to eq(text2)
 	end
 
 
@@ -145,53 +145,53 @@ This is a test.
 		define_em_macro
 		text = %{This is a test em[This can .[=contain test[macros em[test]]=]]}		
 		interpret text
-		@p.document.output.should == %{This is a test <em>This can contain test[macros em[test]]</em>}
+		expect(@p.document.output).to eq(%{This is a test <em>This can contain test[macros em[test]]</em>})
 	end
 
 	it "ruby" do
 		interpret "2 + 2 = %[2+2]"
-		@p.document.output.should == %{2 + 2 = 4}
+		expect(@p.document.output).to eq(%{2 + 2 = 4})
 		interpret "%[lite?]"
-		@p.document.output.should == %{false}
+		expect(@p.document.output).to eq(%{false})
 		interpret "%[def test; end]"
 	end
 
 	it "config" do
 		Glyph["test.setting"] = "TEST"
 		interpret "test.setting = $[test.setting]"
-		@p.document.output.should == %{test.setting = TEST}
+		expect(@p.document.output).to eq(%{test.setting = TEST})
 	end
 	
 	it "config:" do
 		Glyph["test.setting"] = "TEST"
 		interpret "test.setting = $[test.setting]"
-		@p.document.output.should == %{test.setting = TEST}
+		expect(@p.document.output).to eq(%{test.setting = TEST})
 		interpret "test.setting = $:[test.setting|TEST2]$[test.setting]"
-		@p.document.output.should == %{test.setting = TEST2}
+		expect(@p.document.output).to eq(%{test.setting = TEST2})
 		interpret("$:[test.setting]").process
-		Glyph['test.setting'].should == nil
+		expect(Glyph['test.setting']).to eq(nil)
 		Glyph['system.test'] = 1
 		interpret("$:[system.test|2]").process
-		Glyph['system.test'].should == 1
+		expect(Glyph['system.test']).to eq(1)
 	end
 
 	it "macro:" do
 		interpret '%:[e_macro|
 			"Test: #{value}"]e_macro[OK!]'
-		@p.document.output.should == "Test: OK!"
+		expect(@p.document.output).to eq("Test: OK!")
 	end
 
 	it "alias:" do
 		define_em_macro
 		interpret("alias:[test|em]").process
-		Glyph::MACROS[:test].should == Glyph::MACROS[:em]
+		expect(Glyph::MACROS[:test]).to eq(Glyph::MACROS[:em])
 	end
 
 	it "define:" do
 		define_em_macro
 		interpret("def:[def_test|em[{{0}}\\/em[{{a}}]]]").process
-		output_for("def_test[test @a[em[A!]]]").should == "<em>test<em><em>A!</em></em></em>"
-		output_for("def_test[]").should == "<em><em></em></em>"
+		expect(output_for("def_test[test @a[em[A!]]]")).to eq("<em>test<em><em>A!</em></em></em>")
+		expect(output_for("def_test[]")).to eq("<em><em></em></em>")
 	end
 
 	it "define should support recursion" do
@@ -206,17 +206,17 @@ This is a test.
 				]
 			fact[5]
 		}
-		output_for(fact).strip.should == "120"
+		expect(output_for(fact).strip).to eq("120")
 	end
 
 	it "output?" do
 		out = Glyph['document.output']
 		Glyph['document.output'] = "html"
-		output_for("?[output?[html|web]|YES!]").should == "YES!"
+		expect(output_for("?[output?[html|web]|YES!]")).to eq("YES!")
 		Glyph['document.output'] = "web"
-		output_for("?[output?[html|web]|YES!]").should == "YES!"
+		expect(output_for("?[output?[html|web]|YES!]")).to eq("YES!")
 		Glyph['document.output'] = "web5"
-		output_for("?[output?[html|web]|YES!|NO...]").should == "NO..."
+		expect(output_for("?[output?[html|web]|YES!|NO...]")).to eq("NO...")
 	end
 
 	it "let, attribute, attribute:" do
@@ -247,12 +247,12 @@ This is a test.
 		}
 		invalid_set = %{@:[test|1]}
 		invalid_macro = %{=>@[test]}
-		output_for(test).should match("-- 11 --")
-		output_for(nested_test).should match("-- test --")
-		output_for(set_test).should match("-- testchanged! --")
-		output_for(set_test).should match("-- changed again! --")
-		lambda { output_for(invalid_set)}.should raise_error(Glyph::MacroError, "Undeclared attribute 'test'")
-		lambda { output_for(invalid_macro) }.should raise_error
+		expect(output_for(test)).to match("-- 11 --")
+		expect(output_for(nested_test)).to match("-- test --")
+		expect(output_for(set_test)).to match("-- testchanged! --")
+		expect(output_for(set_test)).to match("-- changed again! --")
+		expect { output_for(invalid_set)}.to raise_error(Glyph::MacroError, "Undeclared attribute 'test'")
+		expect { output_for(invalid_macro) }.to raise_error
 		# Set same attribute
 		text = %{
 			let[
@@ -263,50 +263,50 @@ This is a test.
 				]
 			]
 		}
-		output_for(text).strip.should match("---")
+		expect(output_for(text).strip).to match("---")
 	end
 
 	it "add, multiply, subtract" do
-		output_for("add[2|2]").should == "4"
-		output_for("add[1|2|3|4]").should == "10"
-		output_for("add[1|2|-3]").should == "0"
-		output_for("add[a|1|2]").should == "3"
-		output_for("add[a|test]").should == "0"
-		lambda { output_for("add[1]").should == "1"}.should raise_error
-		lambda { output_for("add[]").should == "1"}.should raise_error
-		output_for("subtract[2|2]").should == "0"
-		output_for("subtract[1|2|3|4]").should == "-8"
-		output_for("subtract[1|2|-3]").should == "2"
-		output_for("subtract[a|1|2]").should == "-3"
-		output_for("subtract[a|test]").should == "0"
-		lambda { output_for("subtract[1]").should == "1"}.should raise_error
-		lambda { output_for("subtract[]").should == "1"}.should raise_error
-		output_for("multiply[2|2]").should == "4"
-		output_for("multiply[1|2|3|4]").should == "24"
-		output_for("multiply[1|2|-3]").should == "-6"
-		output_for("multiply[a|1|2]").should == "0"
-		output_for("multiply[a|test]").should == "0"
-		lambda { output_for("multiply[1]").should == "1"}.should raise_error
-		lambda { output_for("multiply[]").should == "1"}.should raise_error
+		expect(output_for("add[2|2]")).to eq("4")
+		expect(output_for("add[1|2|3|4]")).to eq("10")
+		expect(output_for("add[1|2|-3]")).to eq("0")
+		expect(output_for("add[a|1|2]")).to eq("3")
+		expect(output_for("add[a|test]")).to eq("0")
+		expect { expect(output_for("add[1]")).to eq("1")}.to raise_error
+		expect { expect(output_for("add[]")).to eq("1")}.to raise_error
+		expect(output_for("subtract[2|2]")).to eq("0")
+		expect(output_for("subtract[1|2|3|4]")).to eq("-8")
+		expect(output_for("subtract[1|2|-3]")).to eq("2")
+		expect(output_for("subtract[a|1|2]")).to eq("-3")
+		expect(output_for("subtract[a|test]")).to eq("0")
+		expect { expect(output_for("subtract[1]")).to eq("1")}.to raise_error
+		expect { expect(output_for("subtract[]")).to eq("1")}.to raise_error
+		expect(output_for("multiply[2|2]")).to eq("4")
+		expect(output_for("multiply[1|2|3|4]")).to eq("24")
+		expect(output_for("multiply[1|2|-3]")).to eq("-6")
+		expect(output_for("multiply[a|1|2]")).to eq("0")
+		expect(output_for("multiply[a|test]")).to eq("0")
+		expect { expect(output_for("multiply[1]")).to eq("1")}.to raise_error
+		expect { expect(output_for("multiply[]")).to eq("1")}.to raise_error
 	end
 
 	it "s" do
-		lambda { output_for("s/each[test]") }.should raise_error
-		lambda { output_for("s/gsub[]") }.should raise_error
-		output_for("s/gsub[string|/ri/|i]").should == "sting"
-		output_for("s/match[test|/EST/i]").should == "est"
-		output_for("s/upcase[test]").should == "TEST"
-		output_for("s/insert[hell|4|o]").should == "hello"
-		output_for("s/slice[test]").should == ""
+		expect { output_for("s/each[test]") }.to raise_error
+		expect { output_for("s/gsub[]") }.to raise_error
+		expect(output_for("s/gsub[string|/ri/|i]")).to eq("sting")
+		expect(output_for("s/match[test|/EST/i]")).to eq("est")
+		expect(output_for("s/upcase[test]")).to eq("TEST")
+		expect(output_for("s/insert[hell|4|o]")).to eq("hello")
+		expect(output_for("s/slice[test]")).to eq("")
 	end
 
 	it "lt, lte, gt, gte" do
-		lambda { output_for("lt[1|2|3]")}.should raise_error
-		output_for("lt[2|7]").should == "true"
-		output_for("gt[2|7]").should == ""
-		output_for("gte[2|2]").should == "true"
-		output_for("lte[2|2]").should == "true"
-		output_for("gt[aaa|2]").should == "true"
+		expect { output_for("lt[1|2|3]")}.to raise_error
+		expect(output_for("lt[2|7]")).to eq("true")
+		expect(output_for("gt[2|7]")).to eq("")
+		expect(output_for("gte[2|2]")).to eq("true")
+		expect(output_for("lte[2|2]")).to eq("true")
+		expect(output_for("gt[aaa|2]")).to eq("true")
 	end
 
 	it "while" do
@@ -321,21 +321,21 @@ This is a test.
 				@[text]
 			]
 		}
-		output_for(text).strip.should == "-test-test-test-test-test-"
+		expect(output_for(text).strip).to eq("-test-test-test-test-test-")
 	end
 
 	it "fragment" do
 		text = "... ##[id1|test fragment #1] ... ##[id2|test fragment #2]"
 	 	interpret text
-		@p.document.fragments.should == {:id1 => "test fragment #1", :id2 => "test fragment #2"}	
-		@p.document.output.should == "... test fragment #1 ... test fragment #2"
-		lambda { output_for "##[id1|test] -- fragment[id1|test]" }.should raise_error
-		lambda { output_for "##[id1]" }.should raise_error
+		expect(@p.document.fragments).to eq({:id1 => "test fragment #1", :id2 => "test fragment #2"})	
+		expect(@p.document.output).to eq("... test fragment #1 ... test fragment #2")
+		expect { output_for "##[id1|test] -- fragment[id1|test]" }.to raise_error
+		expect { output_for "##[id1]" }.to raise_error
 	end
 
 it "embed" do
 	text = "... <=[id2] ##[id1|test fragment #1] ... ##[id2|test fragment #2] <=[id1]"
-	output_for(text).should == "... test fragment #2 test fragment #1 ... test fragment #2 test fragment #1"
+	expect(output_for(text)).to eq("... test fragment #2 test fragment #1 ... test fragment #2 test fragment #1")
 end	
 
 

data/spec/macros/filters_spec.rb

@@ -16,14 +16,14 @@ describe "Filter Macros" do
 	it "should filter textile input" do
 		text = "textile[This is a _TEST_(TM).]"
 		interpret text
-		@p.document.output.should == "<p>This is a <em><span class=\"caps\">TEST</span></em>&#8482;.</p>"
+		expect(@p.document.output).to eq("<p>This is a <em><span class=\"caps\">TEST</span></em>&#8482;.</p>")
 		Glyph["output.#{Glyph['document.output']}.filter_target"] = :latex
 		interpret text
-		@p.document.output.should == "This is a \\emph{TEST}\\texttrademark{}.\n\n"
+		expect(@p.document.output).to eq("This is a \\emph{TEST}\\texttrademark{}.\n\n")
 		Glyph["output.#{Glyph['document.output']}.filter_target"] = :html
 		Glyph['filters.redcloth.restrictions'] = [:no_span_caps]
 		interpret text
-		@p.document.output.should == "<p>This is a <em>TEST</em>&#8482;.</p>"
+		expect(@p.document.output).to eq("<p>This is a <em>TEST</em>&#8482;.</p>")
 	end
 
 	it "should filter markdown input" do
@@ -35,8 +35,9 @@ describe "Filter Macros" do
 
 etc.]"
 interpret text
-@p.document.output.gsub(/\n|\t|\s{2}/, '').should == 
+expect(@p.document.output.gsub(/\n|\t|\s{2}/, '')).to eq( 
 	"<p>This is a test:</p><ul><li>item 1</li><li>item 2</li><li>item 3</li></ul><p>etc.</p>"
+)
 	end
 
 	it "highlight" do
@@ -64,7 +65,7 @@ interpret text
 				Glyph["filters.highlighter"] = hl.to_sym
 				Glyph.debug_mode = true
 				interpret("highlight[=ruby|\n#{code}=]")
-				@p.document.output.gsub(/\s+/, ' ').strip.should == result.gsub(/\s+/, ' ').strip
+				expect(@p.document.output.gsub(/\s+/, ' ').strip).to eq(result.gsub(/\s+/, ' ').strip)
 			end
 			Glyph['filters.ultraviolet.line_numbers'] = false
 			check.call 'ultraviolet', uv_result if uv
@@ -72,9 +73,9 @@ interpret text
 	end
 
 	it "textile_section, markdown_section" do
-		output_for("§txt[*test*]").should == "<div class=\"section\">\n<p><strong>test</strong></p>\n\n</div>"
-		output_for("§md[*test*]").should == "<div class=\"section\">\n<p><em>test</em></p>\n\n</div>"
-		output_for("textile_section[@title[test]...]").should == "<div class=\"section\">\n<h2 id=\"h_1\" class=\"toc\">test</h2>\n<p>&#8230;</p>\n\n</div>"
+		expect(output_for("§txt[*test*]")).to eq("<div class=\"section\">\n<p><strong>test</strong></p>\n\n</div>")
+		expect(output_for("§md[*test*]")).to eq("<div class=\"section\">\n<p><em>test</em></p>\n\n</div>")
+		expect(output_for("textile_section[@title[test]...]")).to eq("<div class=\"section\">\n<h2 id=\"h_1\" class=\"toc\">test</h2>\n<p>&#8230;</p>\n\n</div>")
 	end
 
 

data/spec/macros/html5_spec.rb

@@ -20,7 +20,7 @@ describe "Macro:" do
 		text = "chapter[@title[Chapter X] ... section[@title[Section Y]@id[sec-y] ... section[@title[Another section] ...]]]"
 		interpret text
 		doc = @p.document
-		doc.output.gsub(/\n|\t/, '').should == %{<section class="chapter">
+		expect(doc.output.gsub(/\n|\t/, '')).to eq(%{<section class="chapter">
 					<header><h1 id="h_1" class="toc">Chapter X</h1></header>... 
 					<section class="section">
 					<header><h1 id="sec-y" class="toc">Section Y</h1></header>... 
@@ -29,13 +29,13 @@ describe "Macro:" do
 						</section>
 					</section>
 				</section>
-		}.gsub(/\n|\t/, '')
-		doc.bookmark?(:"sec-y").should == Glyph::Bookmark.new({:id => :"sec-y", :title => "Section Y", :file => nil})
+		}.gsub(/\n|\t/, ''))
+		expect(doc.bookmark?(:"sec-y")).to eq(Glyph::Bookmark.new({:id => :"sec-y", :title => "Section Y", :file => nil}))
 	end
 
 	it "document, head, style (html5)" do
 		interpret "document[head[style[test.sass]]]"
-		@p.document.output.gsub(/\n|\t/, '').should == %{
+		expect(@p.document.output.gsub(/\n|\t/, '')).to eq(%{
 		<!DOCTYPE html>
 		<html lang="en">
 			<head>
@@ -44,10 +44,10 @@ describe "Macro:" do
 				<meta name="copyright" content="#{Glyph["document.author"]}" />
 				<meta name="generator" content="Glyph v#{Glyph::VERSION} (http://www.h3rald.com/glyph)" />
 				<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-				<style type=\"text/css\">#main {  background-color: blue;  margin: 12px; }</style>
+				<style type=\"text/css\">#main {  background-color: #0000ff;  margin: 12px; }</style>
 			</head>
 		</html>
-		}.gsub(/\n|\t/, '')
+		}.gsub(/\n|\t/, ''))
 	end	
 
 	it "toc (html5)" do
@@ -55,7 +55,7 @@ describe "Macro:" do
 		interpret file_load(Glyph::PROJECT/'document.glyph')
 		doc = @p.document
 		doc.output.gsub!(/\n|\t/, '')
-		doc.output.slice(/(.+?<\/nav>)/, 1).should == %{
+		expect(doc.output.slice(/(.+?<\/nav>)/, 1)).to eq(%{
 			<nav class="contents">
 			<h1 class="toc-header" id="toc">Table of Contents</h1>
 			<ol class="toc">
@@ -63,38 +63,38 @@ describe "Macro:" do
 				<li class="section"><a href="#md">Markdown</a></li>
 			</ol>
 			</nav>
-		}.gsub(/\n|\t/, '')
+		}.gsub(/\n|\t/, ''))
 	end
 
 	it "fmi (html5)" do
 		interpret "fmi[this topic|#test] #[test|Test]"
-		@p.document.output.should == %{<span class="fmi">
+		expect(@p.document.output).to eq(%{<span class="fmi">
 			for more information on <mark>this topic</mark>, 
-			see <a href="#test">Test</a></span> <a id="test">Test</a>}.gsub(/\n|\t/, '')
+			see <a href="#test">Test</a></span> <a id="test">Test</a>}.gsub(/\n|\t/, ''))
 	end	
 
 	it "figure (html5)" do
 		interpret "figure[@alt[ligature]ligature.jpg|Ligature]"
-		@p.document.output.gsub(/\t|\n/, '').should == %{
+		expect(@p.document.output.gsub(/\t|\n/, '')).to eq(%{
 			<figure alt=\"ligature\">
 				<img src=\"images/ligature.jpg\" />
 				<figcaption>Ligature</figcaption>
-			</figure>}.gsub(/\n|\t/, '')
+			</figure>}.gsub(/\n|\t/, ''))
 	end
 
 	it "draftcomment, todo (html5)" do
 		text1 = "dc[comment!]"
 		text2 = "![todo!]"
 		interpret text1
-		@p.document.output.should == ""
+		expect(@p.document.output).to eq("")
 		interpret text2
-		@p.document.output.should == ""
+		expect(@p.document.output).to eq("")
 		Glyph['document.draft'] = true
 		interpret text1
-		@p.document.output.should == %{<aside class="comment"><span class="comment-pre"><strong>Comment:</strong> </span>comment!</aside>}
+		expect(@p.document.output).to eq(%{<aside class="comment"><span class="comment-pre"><strong>Comment:</strong> </span>comment!</aside>})
 		interpret text2
-		@p.document.output.should == %{<aside class="todo"><span class="todo-pre"><strong>TODO:</strong> </span>todo!</aside>}
-		@p.document.todos.length.should == 1
+		expect(@p.document.output).to eq(%{<aside class="todo"><span class="todo-pre"><strong>TODO:</strong> </span>todo!</aside>})
+		expect(@p.document.todos.length).to eq(1)
 		Glyph['document.draft'] = false
 	end
 end