spec/builder_spec.rb in middleman-0.9.0.pre vs spec/builder_spec.rb in middleman-0.9.3

@@ -9,27 +9,32 @@
     @root_dir = project_file("spec", "fixtures", "sample")
   end
 
   before :each do
     build_cmd = project_file("bin", "mm-build")
-    `cd #{@root_dir} && MM_DIR="#{@root_dir}" #{build_cmd}`
+    `cd #{@root_dir} && #{build_cmd}`
   end
 
   after :each do
     FileUtils.rm_rf(File.join(@root_dir, "build"))
   end
-  
-  it "should use layout" do
-    File.exists?("#{@root_dir}/build/index.html").should be_true
-    File.read("#{@root_dir}/build/index.html").should include("Comment in layout")
+
+  xit "should build markaby files" do
+    File.exists?("#{@root_dir}/build/markaby.html").should be_true
+    File.read("#{@root_dir}/build/markaby.html").should include("<title>Hi Markaby</title>")
   end
   
   it "should build haml files" do
     File.exists?("#{@root_dir}/build/index.html").should be_true
     File.read("#{@root_dir}/build/index.html").should include("<h1>Welcome</h1>")
   end
   
+  xit "should build maruku files" do
+    File.exists?("#{@root_dir}/build/maruku.html").should be_true
+    File.read("#{@root_dir}/build/maruku.html").should include("<h1 class='header' id='hello_maruku'>Hello Maruku</h1>")
+  end
+  
   it "should build static files" do
     File.exists?("#{@root_dir}/build/static.html").should be_true
     File.read("#{@root_dir}/build/static.html").should include("Static, no code!")
   end
 
@@ -37,26 +42,24 @@
     File.exists?("#{@root_dir}/build/services/index.html").should be_true
   end
 
   it "should build sass files" do
     File.exists?("#{@root_dir}/build/stylesheets/site.css").should be_true
-    File.read("#{@root_dir}/build/stylesheets/site.css").gsub(/\s/, "").should include("html,body,div,span,applet,object,iframe")
+    File.read("#{@root_dir}/build/stylesheets/site.css").should include("html,body,div,span,applet,object,iframe")
   end
 
-  it "should build less files" do
-    File.exists?("#{@root_dir}/build/stylesheets/test_less.css").should be_true
-    File.read("#{@root_dir}/build/stylesheets/test_less.css").should include("666")
-  end
-
-  it "should build scss files" do
-    File.exists?("#{@root_dir}/build/stylesheets/site_scss.css").should be_true
-    File.read("#{@root_dir}/build/stylesheets/site_scss.css").gsub(/\s/, "").should include("html,body,div,span,applet,object,iframe")
-  end
-
   it "should build static css files" do
     File.exists?("#{@root_dir}/build/stylesheets/static.css").should be_true
   end
   
   it "should not build partial files" do
     File.exists?("#{@root_dir}/build/_partial.html").should be_false
+  end
+  
+  it "should minify inline javascript" do
+    File.readlines("#{@root_dir}/build/inline-js.html").length.should == 9
+  end
+
+  it "should combine javascript" do
+    File.read("#{@root_dir}/build/javascripts/empty-with-include.js").should include("combo")
   end
 end
\ No newline at end of file