More font paths test coverage.

Specifically, the new cases check the correctness of paths generated by
font_files / font_url when relative_assets is on in build mode, and when
a custom fonts_dir is specified in preview mode.

middleman-more/features/fonts.feature

@@ -6,8 +6,10 @@ Feature: Web Fonts
     Then the following files should exist:
       | stylesheets/fonts.css                         |
     And the file "stylesheets/fonts.css" should contain "/fonts/StMarie-Thin.otf"
-    
+    And the file "stylesheets/fonts.css" should contain "/fonts/blank/blank.otf"
+
   Scenario: Rendering scss
     Given the Server is running at "fonts-app"
     When I go to "/stylesheets/fonts.css"
-    Then I should see "/fonts/StMarie-Thin.otf"
+    Then I should see "/fonts/StMarie-Thin.otf"
+    And I should see "/fonts/blank/blank.otf"

middleman-more/features/relative_assets.feature

@@ -1,13 +1,13 @@
 Feature: Relative Assets
   In order easily switch between relative and absolute paths
-    
+
   Scenario: Previewing css with the feature disabled
     Given "relative_assets" feature is "disabled"
     And the Server is running at "relative-assets-app"
     When I go to "/stylesheets/relative_assets.css"
     Then I should not see "url('../"
     And I should see "/images/blank.gif')"
-    
+
   Scenario: Building css with the feature disabled
     Given a fixture app "relative-assets-app"
     And a file named "config.rb" with:
@@ -16,7 +16,7 @@ Feature: Relative Assets
     Given a successfully built app at "relative-assets-app"
     When I cd to "build"
     Then the file "stylesheets/relative_assets.css" should contain "url('/images/blank.gif')"
-    
+
   Scenario: Rendering html with the feature disabled
     Given "relative_assets" feature is "disabled"
     And the Server is running at "relative-assets-app"
@@ -28,7 +28,7 @@ Feature: Relative Assets
     And the Server is running at "relative-assets-app"
     When I go to "/stylesheets/relative_assets.css"
     Then I should see "url('../images/blank.gif"
-    
+
   Scenario: Building css with the feature enabled
     Given a fixture app "relative-assets-app"
     And a file named "config.rb" with:
@@ -38,7 +38,7 @@ Feature: Relative Assets
     Given a successfully built app at "relative-assets-app"
     When I cd to "build"
     Then the file "stylesheets/relative_assets.css" should contain "url('../images/blank.gif')"
-    
+
   Scenario: Relative css reference with directory indexes
     Given a fixture app "relative-assets-app"
     And a file named "config.rb" with:
@@ -49,21 +49,21 @@ Feature: Relative Assets
     Given a successfully built app at "relative-assets-app"
     When I cd to "build"
     Then the file "relative_image/index.html" should contain "../stylesheets/relative_assets.css"
-    
+
   Scenario: Rendering html with the feature enabled
     Given "relative_assets" feature is "enabled"
     And the Server is running at "relative-assets-app"
     When I go to "/relative_image.html"
     Then I should not see "/images/blank.gif"
     And I should see "images/blank.gif"
-    
+
   Scenario: Rendering css with a custom images_dir
     Given "relative_assets" feature is "enabled"
     And "images_dir" is set to "img"
     And the Server is running at "relative-assets-app"
     When I go to "/stylesheets/relative_assets.css"
     Then I should see "url('../img/blank.gif')"
-    
+
   Scenario: Building css with a custom images_dir
     Given a fixture app "relative-assets-app"
     And a file named "config.rb" with:
@@ -74,7 +74,7 @@ Feature: Relative Assets
     Given a successfully built app at "relative-assets-app"
     When I cd to "build"
     Then the file "stylesheets/relative_assets.css" should contain "url('../img/blank.gif')"
-    
+
   Scenario: Rendering html with a custom images_dir
     Given "relative_assets" feature is "enabled"
     And "images_dir" is set to "img"
@@ -83,12 +83,46 @@ Feature: Relative Assets
     Then I should not see "/images/blank.gif"
     Then I should not see "/img/blank.gif"
     And I should see "img/blank.gif"
-    
+
   Scenario: Rendering scss with the feature enabled
     Given "relative_assets" feature is "enabled"
     And the Server is running at "fonts-app"
     When I go to "/stylesheets/fonts.css"
     Then I should see "url('../fonts/StMarie-Thin.otf"
+    And I should see "url('../fonts/blank/blank.otf"
+
+  Scenario: Rendering scss with the feature enabled and a custom fonts_dir
+    Given "relative_assets" feature is "enabled"
+    And "fonts_dir" is set to "otf"
+    And the Server is running at "fonts-app"
+    When I go to "/stylesheets/fonts.css"
+    Then I should not see "url('../fonts/StMarie-Thin.otf"
+    And I should see "url('../otf/StMarie-Thin.otf"
+    And I should see "url('../otf/blank/blank.otf"
+
+  Scenario: Building scss with the feature enabled
+    Given a fixture app "fonts-app"
+    And a file named "config.rb" with:
+      """
+      activate :relative_assets
+      """
+    Given a successfully built app at "fonts-app"
+    When I cd to "build"
+    Then the file "stylesheets/fonts.css" should contain "url('../fonts/StMarie-Thin.otf')"
+    And the file "stylesheets/fonts.css" should contain "url('../fonts/blank/blank.otf')"
+
+  Scenario: Building scss with the feature enabled and a custom fonts_dir
+    Given a fixture app "fonts-app"
+    And a file named "config.rb" with:
+      """
+      set :fonts_dir, "otf"
+      activate :relative_assets
+      """
+    Given a successfully built app at "fonts-app"
+    When I cd to "build"
+    Then the file "stylesheets/fonts.css" should not contain "url('../fonts/StMarie-Thin.otf')"
+    And the file "stylesheets/fonts.css" should contain "url('../otf/StMarie-Thin.otf')"
+    And the file "stylesheets/fonts.css" should contain "url('../otf/blank/blank.otf')"
 
   Scenario: Relative assets via image_tag
     Given a fixture app "relative-assets-app"
@@ -99,4 +133,4 @@ Feature: Relative Assets
       """
     And the Server is running at "relative-assets-app"
     When I go to "/sub/image_tag.html"
-    Then I should see '<img src="../img/blank.gif" />'
+    Then I should see '<img src="../img/blank.gif" />'

middleman-more/fixtures/fonts-app/source/stylesheets/fonts.css.sass

@@ -1,3 +1,5 @@
 @import "compass/css3/font-face"
 
-+font-face("St Marie", font-files("StMarie-Thin.otf", opentype))
++font-face("St Marie", font-files("StMarie-Thin.otf", opentype))
++font-face("St Marie", font-files("blank/blank.otf", opentype))
+

middleman-more/fixtures/relative-assets-app/source/stylesheets/relative_assets.css.sass

@@ -1,3 +1,3 @@
 @import "compass"
 h1
-  background: image-url("blank.gif")
+  background: image-url("blank.gif")