middleman-core 3.4.1 → 4.0.0.alpha.2

data/features/mount_rack.feature

@@ -47,11 +47,9 @@ Feature: Support Rack apps mounted using map
         run MySinatra
       end
 
-      configure :build do
-        endpoint "sinatra/index2.html", :path => "/sinatra/"
-      end
+      endpoint "sinatra/index2.html", path: "/sinatra/"
 
-      endpoint "dedoo.html", :path => "/sinatra/derp.html"
+      endpoint "dedoo.html", path: "/sinatra/derp.html"
 
       endpoint "hello.html" do
         "world"

data/features/multiple-sources.feature

@@ -0,0 +1,27 @@
+Feature: Allow multiple sources to be setup.
+
+  Scenario: Three source directories.
+    Given the Server is running at "multiple-sources-app"
+    When I go to "/index.html"
+    Then I should see "Default Source"
+
+    When I go to "/index1.html"
+    Then I should see "Source 1"
+
+    When I go to "/index2.html"
+    Then I should see "Source 2"
+
+    When I go to "/override-in-two.html"
+    Then I should see "Overridden 2"
+
+    When I go to "/override-in-one.html"
+    Then I should see "Opposite 2"
+
+  Scenario: Three data directories.
+    Given the Server is running at "multiple-data-sources-app"
+    When I go to "/index.html"
+    Then I should see "Default: Data Default"
+    Then I should see "Data 1: Data 1"
+    Then I should see "Data 2: Data 2"
+    Then I should see "Override in Two: Overridden 2"
+    Then I should see "Override in One: Opposite 2"

data/features/proxy_pages.feature

@@ -15,8 +15,6 @@ Feature: Proxy Pages (using proxy rather than page)
       | fake2/two.html                                |
       | fake3/one.html                                |
       | fake3/two.html                                |
-      | fake4/one.html                                |
-      | fake4/two.html                                |
       | target_ignore.html                            |
       | target_ignore2.html                           |
       | target_ignore3.html                           |
@@ -35,8 +33,6 @@ Feature: Proxy Pages (using proxy rather than page)
     Then I should see "I am real"
     When I go to "/fake3.html"
     Then I should see "I am real"
-    When I go to "/fake4.html"
-    Then I should see "I am real"
     
   Scenario: Preview proxy with variable one
     Given the Server is running at "proxy-pages-app"
@@ -49,9 +45,6 @@ Feature: Proxy Pages (using proxy rather than page)
     When I go to "/fake3/one.html"
     Then I should see "I am real: one"
     
-    When I go to "/fake4/one.html"
-    Then I should see "I am real: one"
-    
   Scenario: Preview proxy with variable two
     Given the Server is running at "proxy-pages-app"
     When I go to "/fake/two.html"
@@ -62,9 +55,6 @@ Feature: Proxy Pages (using proxy rather than page)
     
     When I go to "/fake3/two.html"
     Then I should see "I am real: two"
-    
-    When I go to "/fake4/two.html"
-    Then I should see "I am real: two"
 
   Scenario: Build proxy with variable one
     Given a successfully built app at "proxy-pages-app"

data/features/redirects.feature

@@ -4,18 +4,17 @@ Feature: Meta redirects
     Given a fixture app "large-build-app"
     And a file named "config.rb" with:
     """
-    redirect "hello.html", :to => "world.html"
+    redirect "hello.html", to: "world.html"
     """
     And the Server is running at "large-build-app"
     When I go to "/hello.html"
-    Then I should see '<link rel="canonical" href="world.html"'
     Then I should see '<meta http-equiv=refresh content="0; url=world.html"'
 
   Scenario: Redirect to external site
     Given a fixture app "large-build-app"
     And a file named "config.rb" with:
     """
-    redirect "hello.html", :to => "http://example.com"
+    redirect "hello.html", to: "http://example.com"
     """
     And the Server is running at "large-build-app"
     When I go to "/hello.html"
@@ -27,7 +26,7 @@ Feature: Meta redirects
     """
     ready do
       r = sitemap.find_resource_by_path("static.html")
-      redirect "hello.html", :to => r
+      redirect "hello.html", to: r
     end
     """
     And the Server is running at "large-build-app"
@@ -39,8 +38,8 @@ Feature: Meta redirects
     And a file named "config.rb" with:
     """
     activate :directory_indexes
-    redirect "hello.html", :to => "link_test.html"
-    redirect "hello2.html", :to => "services/index.html"
+    redirect "hello.html", to: "link_test.html"
+    redirect "hello2.html", to: "services/index.html"
     """
     And the Server is running at "large-build-app"
     When I go to "/hello/index.html"
@@ -52,7 +51,7 @@ Feature: Meta redirects
     Given a fixture app "large-build-app"
     And a file named "config.rb" with:
     """
-    redirect "hello.html", :to => "world.html" do |from, to|
+    redirect "hello.html", to: "world.html" do |from, to|
       "#{from} to #{to}"
     end
     """

data/features/relative_assets.feature

@@ -6,7 +6,7 @@ Feature: Relative Assets
     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')"
+    And I should see '/images/blank.gif")'
 
   Scenario: Building css with the feature disabled
     Given a fixture app "relative-assets-app"
@@ -15,25 +15,21 @@ 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')"
+    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"
     When I go to "/relative_image.html"
-    Then I should see '"/stylesheets/relative_assets.css"'
-    Then I should see '"/javascripts/app.js"'
-    Then I should see "/images/blank.gif"
-    When I go to "/absolute_image_relative_css.html"
-    Then I should see '"stylesheets/relative_assets.css"'
-    Then I should see '"javascripts/app.js"'
     Then I should see "/images/blank.gif"
 
   Scenario: Rendering css with the feature enabled
     Given "relative_assets" feature is "enabled"
     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"
+    Then I should see 'url("../images/blank.gif'
+    When I go to "/javascripts/application.js"
+    Then I should not see "../"
 
   Scenario: Building css with the feature enabled
     Given a fixture app "relative-assets-app"
@@ -43,7 +39,8 @@ 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')"
+    Then the file "stylesheets/relative_assets.css" should contain 'url("../images/blank.gif")'
+    Then the file "javascripts/application.js" should not contain "../"
 
   Scenario: Relative css reference with directory indexes
     Given a fixture app "relative-assets-app"
@@ -60,56 +57,21 @@ Feature: Relative Assets
     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 see '"stylesheets/relative_assets.css"'
-    Then I should see '"javascripts/app.js"'
-    When I go to "/relative_image_absolute_css.html"
-    Then I should see '"/stylesheets/relative_assets.css"'
-    Then I should see '"/javascripts/app.js"'
     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:
-      """
-      set :images_dir, "img"
-      activate :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"
-    And the Server is running at "relative-assets-app"
-    When I go to "/relative_image.html"
-    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"
+    Then I should see:
+      """
+      url("../fonts/StMarie-Thin.otf"
+      """
+    And I should see:
+      """
+      url("../fonts/blank/blank.otf"
+      """
 
   Scenario: Building scss with the feature enabled
     Given a fixture app "fonts-app"
@@ -119,21 +81,14 @@ Feature: 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:
+    Then the file "stylesheets/fonts.css" should contain:
       """
-      set :fonts_dir, "otf"
-      activate :relative_assets
+      url("../fonts/StMarie-Thin.otf")
+      """
+    And the file "stylesheets/fonts.css" should contain:
+      """
+      url("../fonts/blank/blank.otf")
       """
-    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"

data/features/slim.feature

@@ -40,7 +40,11 @@ Feature: Support slim templating language
         head
           meta charset="utf-8"
           scss:
-            @import "compass";
+            @mixin global-reset {
+              html, body, div {
+                padding: 0;
+              }
+            }
             @include global-reset;
         body
           h1 Welcome to Slim
@@ -52,8 +56,8 @@ Feature: Support slim templating language
         head
           meta charset="utf-8"
           sass:
-            @import "compass"
-            +global-reset
+            html, body, div
+              padding: 0
         body
           h1 Welcome to Slim
       """
@@ -64,14 +68,14 @@ Feature: Support slim templating language
         head
           meta charset="utf-8"
           scss:
-            +global-reset
+            +global-reset2
         body
           h1 Welcome to Slim
       """
     And the Server is running at "empty_app"
     When I go to "/scss.html"
-    Then I should see "html, body, div"
+    Then I should see "html,body,div"
     When I go to "/sass.html"
-    Then I should see "html, body, div"
+    Then I should see "html,body,div"
     When I go to "/error.html"
-    Then I should see "Error: Invalid"
+    Then I should see "Syntax error"

data/features/stylus.feature

@@ -1,4 +1,4 @@
-@wip @nojava
+@nojava
 Feature: Stylus Updates and Partials
   Scenario: The preview server should update stylesheets when Stylus changes
     Given the Server is running at "stylus-preview-app"

data/features/support/env.rb

@@ -1,15 +1,15 @@
 ENV["TEST"] = "true"
-ENV["AUTOLOAD_SPROCKETS"] = "false"
+ENV["AUTOLOAD_SPROCKETS"] ||= "false"
 
 require 'simplecov'
 SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..'))
 
-require 'capybara/poltergeist'
-Capybara.javascript_driver = :poltergeist
-
 require 'coveralls'
 Coveralls.wear!
 
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
+
 PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-core')
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-core', 'step_definitions')

data/fixtures/asset-hash-app/config.rb

@@ -4,5 +4,3 @@ activate :asset_hash
 activate :relative_assets
 
 activate :directory_indexes
-
-#page '/foo.html', :directory_index => false

data/fixtures/asset-hash-app/source/index.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <h2>Image url:</h2>
-<img src="<%= image_path('100px.jpg') %>" srcset="<%= image_path('100px.jpg') %> 1x, <%= image_path('200px.jpg') %> 2x, <%= image_path('300px.jpg') %> 3x">
+<img src="<%= image_path('100px.jpg') %>">
 
 <h2>Ignored path:</h2>
 <link rel="apple-touch-icon" href="apple-touch-icon.png">

data/fixtures/asset-hash-host-app/config.rb

@@ -1,6 +1,4 @@
 
 activate :asset_hash
 activate :directory_indexes
-activate :asset_host
-
-set :asset_host, 'http://middlemanapp.com'
+activate :asset_host, host: 'http://middlemanapp.com'

data/fixtures/asset-host-app/source/asset_host.html.erb

@@ -1 +1,20 @@
-<%= image_tag "blank.gif" %>
+<%= image_tag "blank0.gif" %>
+<%= image_tag "blank1.gif" %>
+<%= image_tag "blank2.gif" %>
+<%= image_tag "blank3.gif" %>
+<%= image_tag "blank4.gif" %>
+<%= image_tag "blank10.gif" %>
+<%= image_tag "blank21.gif" %>
+<%= image_tag "blank32.gif" %>
+<%= image_tag "blank43.gif" %>
+<%= image_tag "blank54.gif" %>
+<%= image_tag "blank20.gif" %>
+<%= image_tag "blank21.gif" %>
+<%= image_tag "blank22.gif" %>
+<%= image_tag "blank23.gif" %>
+<%= image_tag "blank24.gif" %>
+<%= image_tag "blank30.gif" %>
+<%= image_tag "blank31.gif" %>
+<%= image_tag "blank32.gif" %>
+<%= image_tag "blank33.gif" %>
+<%= image_tag "blank34.gif" %>

data/fixtures/asset-host-app/source/stylesheets/asset_host.css.sass

@@ -1,3 +1,48 @@
-@import "compass"
 h1
-  background: image-url("blank.gif")
+  background: image-url("blank1.gif")
+h2
+  background: image-url("blank2.gif")
+h3
+  background: image-url("blank3.gif")
+h4
+  background: image-url("blank4.gif")
+h5
+  background: image-url("blank5.gif")
+h6
+  background: image-url("blank6.gif")
+h7
+  background: image-url("blank7.gif")
+h8
+  background: image-url("blank8.gif")
+h11
+  background: image-url("blank11.gif")
+h12
+  background: image-url("blank21.gif")
+h13
+  background: image-url("blank31.gif")
+h14
+  background: image-url("blank41.gif")
+h15
+  background: image-url("blank51.gif")
+h16
+  background: image-url("blank61.gif")
+h17
+  background: image-url("blank71.gif")
+h18
+  background: image-url("blank81.gif")
+h21
+  background: image-url("blank12.gif")
+h22
+  background: image-url("blank22.gif")
+h23
+  background: image-url("blank32.gif")
+h24
+  background: image-url("blank42.gif")
+h25
+  background: image-url("blank52.gif")
+h26
+  background: image-url("blank62.gif")
+h27
+  background: image-url("blank72.gif")
+h28
+  background: image-url("blank82.gif")

data/fixtures/auto-css-app/config.rb

@@ -1,11 +1,9 @@
-with_layout false do
-  %w{
-    /auto-css.html
-    /auto-css
-    /auto-css/
-    /auto-css/auto-css.html
-    /auto-css/sub/auto-css.html
-  }.each do |path|
-    page path
-  end
+%w{
+  /auto-css.html
+  /auto-css
+  /auto-css/
+  /auto-css/auto-css.html
+  /auto-css/sub/auto-css.html
+}.each do |path|
+  page path, layout: false
 end