Add test cleanup from #16

Author: schneidmaster

.rspec

@@ -1 +1,2 @@
---color
+--color
+--require spec_helper

spec/checkbox_examples_spec.rb

@@ -1,8 +1,5 @@
-# encoding: utf-8
-$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
-require 'html2confluence'
-
 describe HTMLToConfluenceParser, "when running checkbox examples" do
+  let(:parser) { HTMLToConfluenceParser.new }
 
   it "should match checkboxes" do
     html = <<-END
@@ -17,16 +14,14 @@
     END
 
     markup = <<-END
-* (/) Example 1
-* (/) Example 2
-* (x) Example 3
-* (/) Example 4
-* (x) Example 5
+* (/) Example 1 
+* (/) Example 2 
+* (x) Example 3 
+* (/) Example 4 
+* (x) Example 5 
     END
 
-    parser = HTMLToConfluenceParser.new
     parser.feed(html)
     expect(parser.to_wiki_markup.strip).to include(markup.strip)
   end
-  
 end

spec/combination_examples_spec.rb

@@ -1,8 +1,6 @@
-# encoding: utf-8
-$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
-require 'html2confluence'
-
 describe HTMLToConfluenceParser, "when running combination examples" do
+  let(:parser) { HTMLToConfluenceParser.new }
+
   it "should match complex examples" do
     html = <<-END
 <ol>
@@ -17,9 +15,7 @@
 # numbered *item* that is +underlined+. 
 # list
     END
-    
-    
-    parser = HTMLToConfluenceParser.new
+
     parser.feed(html)
     expect(parser.to_wiki_markup.strip).to include(markup.strip)
   end
@@ -94,7 +90,6 @@
 h1. With +nice+ formatting.
     END
 
-    parser = HTMLToConfluenceParser.new
     parser.feed(html)
     expect(parser.to_wiki_markup.strip).to include(markup.strip)
   end
@@ -114,7 +109,6 @@
 {quote}
     END
 
-    parser = HTMLToConfluenceParser.new
     parser.feed(html)
     expect(parser.to_wiki_markup.strip).to include(markup.strip)
   end
@@ -127,7 +121,6 @@
 
     markup = "Previous\n\n*Scenario 4a: Existing deletes their ID*\n*Given* I am an existing user"
 
-    parser = HTMLToConfluenceParser.new
     parser.feed(html)
     expect(parser.to_wiki_markup.strip).to eq(markup)
   end
@@ -141,7 +134,6 @@
 
     markup = "Previous line\n\n*Scenario 4a: Existing deletes their ID*\n*Given* I am an existing user"
 
-    parser = HTMLToConfluenceParser.new
     parser.feed(html)
     expect(parser.to_wiki_markup.strip).to eq(markup)
   end
@@ -151,7 +143,6 @@
 
     markup = "*And* first line\n\n*second line*"
 
-    parser = HTMLToConfluenceParser.new
     parser.feed(html)
     expect(parser.to_wiki_markup.strip).to eq(markup)
   end
@@ -161,7 +152,6 @@
 
     markup = "!a source!"
 
-    parser = HTMLToConfluenceParser.new
     parser.feed(html)
     expect(parser.to_wiki_markup.strip).to eq(markup)
   end
@@ -170,7 +160,6 @@
     html = "<div>familiar with the XML<wbr>Http<wbr>Request Object</div>\n\n"
 
     markup = "familiar with the XMLHttpRequest Object"
-    parser = HTMLToConfluenceParser.new
     parser.feed(html)
     expect(parser.to_wiki_markup.strip).to eq(markup)
 
@@ -184,7 +173,6 @@
 
     markup = "Previous line\n\n----"
 
-    parser = HTMLToConfluenceParser.new
     parser.feed(html)
     expect(parser.to_wiki_markup.strip).to eq(markup)
   end
@@ -196,7 +184,6 @@
 
     markup = "A"
 
-    parser = HTMLToConfluenceParser.new
     parser.feed(html)
     expect(parser.to_wiki_markup.strip).to eq(markup)
   end
@@ -209,7 +196,6 @@
 
     markup = "A"
 
-    parser = HTMLToConfluenceParser.new
     parser.feed(html)
     expect(parser.to_wiki_markup.strip).to eq(markup)
   end  

spec/complex_tables_spec.rb

@@ -1,9 +1,7 @@
-# encoding: utf-8
-$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
-require 'html2confluence'
-
 describe HTMLToConfluenceParser, "when running complex tables examples" do
-   it "should handle table with newlines" do
+  let(:parser) { HTMLToConfluenceParser.new }
+
+  it "should handle table with newlines" do
     html = <<-END
     <table class="mce-item-table"><tbody><tr><td>As a...</td><td>I would like...</td><td>Because...</td></tr><tr><td><p>Student<br>or</p><p>Teacher</p></td><td>There to be more candy</td><td><p>Candy is:</p><ul><li>Delicious</li><li>Shiny</li><li>Good for my teeth</li></ul></td></tr></tbody></table>
     END
@@ -20,12 +18,11 @@
 * Good for my teeth|
     END
 
-    parser = HTMLToConfluenceParser.new
     parser.feed(html)
     expect(parser.to_wiki_markup.strip).to include(markup.strip)
   end
 
-   it "should handle table empty cells" do
+  it "should handle table empty cells" do
     html = <<-END
     <table class="mce-item-table"><tbody><tr><td><p><br data-mce-bogus="1"></p></td><td>Empty</td><td><p><br data-mce-bogus="1"></p></td></tr></tbody></table>
     END
@@ -34,12 +31,11 @@
 | |Empty| |
     END
 
-    parser = HTMLToConfluenceParser.new
     parser.feed(html)
     expect(parser.to_wiki_markup.strip).to include(markup.strip)
   end
 
-   it "should handle pre in table empty cells" do
+  it "should handle pre in table empty cells" do
     html = <<-END
     <table><tbody><tr><td><pre>a</pre></td><td>d</td></tr><tr><td><pre>b</pre></td><td>c</td></tr></tbody></table>
     END
@@ -51,12 +47,11 @@
 b{noformat} |c |
     END
 
-    parser = HTMLToConfluenceParser.new
     parser.feed(html)
     expect(parser.to_wiki_markup.strip).to include(markup.strip)
   end
 
-   it "should handle pre in table" do
+  it "should handle pre in table" do
     html = <<-END
     <table><tbody>
       <tr>
@@ -78,7 +73,6 @@
 2{noformat} |3  |
     END
 
-    parser = HTMLToConfluenceParser.new
     parser.feed(html)
     expect(parser.to_wiki_markup.strip).to include(markup.strip)
   end