organizes specs

spec/lib/microformats2/collection_spec.rb

@@ -2,9 +2,24 @@ require "spec_helper"
 require "microformats2"
 
 describe Microformats2::Collection do
-  describe "with simple .h-card" do
+  describe "programatic case" do
+    cases_dir = "spec/support/cases/microformats.org/microformats-2"
+    html_files = Dir.entries(cases_dir).keep_if { |f| f =~ /([.]html$)/ }
+
+    html_files.each do |html_file|
+      it "#{html_file}" do
+        json_file = html_file.gsub(/([.]html$)/, ".js")
+        html = open(File.join(cases_dir, html_file)).read
+        json = open(File.join(cases_dir, json_file)).read
+
+        JSON.parse(Microformats2.parse(html).to_json).should == JSON.parse(json)
+      end
+    end
+  end
+
+  describe ".h-card simple" do
     before do
-      html = "spec/support/simple_hcard.html"
+      html = "spec/support/hcard-simple.html"
       @collection = Microformats2.parse(html)
     end
 
@@ -46,9 +61,9 @@ describe Microformats2::Collection do
     end
   end
 
-  describe "with .h-entry .p-author.h-card nested" do
+  describe ".h-entry .p-author.h-card nested" do
     before do
-      html = "spec/support/nested_hentry.html"
+      html = "spec/support/hentry-pauthor-hcard-nested.html"
       @collection = Microformats2.parse(html)
     end
 

spec/lib/microformats2_spec.rb

@@ -19,7 +19,7 @@ describe Microformats2 do
       Microformats2.read_html(@html).should include @html
     end
     it "can be a file path to html" do
-      html = "spec/support/simple_hcard.html"
+      html = "spec/support/hcard-simple.html"
       Microformats2.read_html(html).should include "<div class=\"h-card\">"
     end
     it "can be a url to html" do
@@ -27,19 +27,4 @@ describe Microformats2 do
       Microformats2.read_html(html).should include "google"
     end
   end
-
-  describe "programatic case" do
-    cases_dir = "spec/support/cases/microformats.org/microformats-2"
-    html_files = Dir.entries(cases_dir).keep_if { |f| f =~ /([.]html$)/ }
-
-    html_files.each do |html_file|
-      it "#{html_file}" do
-        json_file = html_file.gsub(/([.]html$)/, ".js")
-        html = open(File.join(cases_dir, html_file)).read
-        json = open(File.join(cases_dir, json_file)).read
-
-        JSON.parse(Microformats2.parse(html).to_json).should == JSON.parse(json)
-      end
-    end
-  end
 end