middleman-core 3.4.1 → 4.0.0.alpha.2

data/features/content_type.feature

@@ -12,15 +12,13 @@ Feature: Setting the right content type for files
     Then the content type should be "text/css"
     When I go to "/README"
     Then the content type should be "text/plain"
-    When I go to "/index.php"
-    Then the content type should be "text/php"
 
   Scenario: Content type can be set explicitly via page or proxy or frontmatter
     Given a fixture app "content-type-app"
     And a file named "config.rb" with:
     """
-    page "README", :content_type => 'text/awesome'
-    proxy "bar", "index.html", :content_type => 'text/custom'
+    page "README", content_type: 'text/awesome'
+    proxy "bar", "index.html", content_type: 'text/custom'
     proxy "foo", "README" # auto-delegate to target content type
     """
     And the Server is running at "content-type-app"
@@ -33,7 +31,6 @@ Feature: Setting the right content type for files
     When I go to "/override.html"
     Then the content type should be "text/neato"
 
-  @preserve_mime_types
   Scenario: Content types can be overridden with mime_type
     Given a fixture app "content-type-app"
     And a file named "config.rb" with:

data/features/custom_layouts.feature

@@ -1,26 +1,22 @@
 Feature: Custom layouts
   In order easily switch between relative and absolute paths
-  
+
   Scenario: Using custom :layout attribute
-    Given page "/custom-layout.html" has layout "custom"
-    And the Server is running at "custom-layout-app2"
-    When I go to "/custom-layout.html"
-    Then I should see "Custom Layout"
-    
-  Scenario: Using with_layout block
-    Given "/custom-layout.html" with_layout block has layout "custom"
+    Given a fixture app "custom-layout-app2"
+    And a file named "config.rb" with:
+      """
+      page '/custom-layout.html', layout: :custom
+      """
     And the Server is running at "custom-layout-app2"
     When I go to "/custom-layout.html"
     Then I should see "Custom Layout"
 
-  Scenario: Using with_layout block with globs
-    Given "/custom-*" with_layout block has layout "custom"
-    And the Server is running at "custom-layout-app2"
-    When I go to "/custom-layout.html"
-    Then I should see "Custom Layout"
-    
   Scenario: Using custom :layout attribute with folders
-    Given page "/custom-layout-dir/" has layout "custom"
+    Given a fixture app "custom-layout-app2"
+    And a file named "config.rb" with:
+      """
+      page '/custom-layout-dir/', layout: :custom
+      """
     And the Server is running at "custom-layout-app2"
     When I go to "/custom-layout-dir"
     Then I should see "Custom Layout"
@@ -28,9 +24,13 @@ Feature: Custom layouts
     Then I should see "Custom Layout"
     When I go to "/custom-layout-dir/index.html"
     Then I should see "Custom Layout"
-    
+
   Scenario: Using custom :layout attribute with folders
-    Given page "/custom-layout-dir" has layout "custom"
+    Given a fixture app "custom-layout-app2"
+    And a file named "config.rb" with:
+      """
+      page '/custom-layout-dir', layout: :custom
+      """
     And the Server is running at "custom-layout-app2"
     When I go to "/custom-layout-dir"
     Then I should see "Custom Layout"
@@ -38,9 +38,13 @@ Feature: Custom layouts
     Then I should see "Custom Layout"
     When I go to "/custom-layout-dir/index.html"
     Then I should see "Custom Layout"
-    
+
   Scenario: Using custom :layout attribute with folders
-    Given page "/custom-layout-dir/index.html" has layout "custom"
+    Given a fixture app "custom-layout-app2"
+    And a file named "config.rb" with:
+      """
+      page '/custom-layout-dir/index.html', layout: :custom
+      """
     And the Server is running at "custom-layout-app2"
     When I go to "/custom-layout-dir"
     Then I should see "Custom Layout"
@@ -48,7 +52,7 @@ Feature: Custom layouts
     Then I should see "Custom Layout"
     When I go to "/custom-layout-dir/index.html"
     Then I should see "Custom Layout"
-  
+
   Scenario: Setting layout inside a matching page block
     Given the Server is running at "page-helper-layout-block-app"
     When I go to "/index.html"

data/features/data.feature

@@ -51,31 +51,3 @@ Feature: Local Data API
     Then I should see "title1:Hello"
     Then I should see "title2:More"
     Then I should see "title3:Stuff"
-
-  Scenario: Invalid YAML
-    Given a fixture app "basic-data-app"
-    And the default aruba exit timeout is 30 seconds
-    And a file named "data/test.yml" with:
-      """
-      'ASDSFDa:
-       -asdf asdf
-      """
-    When I run `middleman build`
-    Then the output should contain:
-    """
-    failed due to an error:
-    """
-
-  Scenario: Invalid JSON
-    Given a fixture app "basic-data-app"
-    And the default aruba exit timeout is 30 seconds
-    And a file named "data/test.json" with:
-      """
-      'ASDSFDa:
-       -asdf asdf
-      """
-    When I run `middleman build`
-    Then the output should contain:
-    """
-    failed due to an error:
-    """

data/features/directory_index.feature

@@ -25,23 +25,24 @@ Feature: Directory Index
     And the file "a_folder/needs_index/index.html" should contain "Indexable"
     And the file "leave_me_alone.html" should contain "Stay away"
     And the file "regular/index.html" should contain "Regular"
-    And the file "evil spaces/index.html" should contain "Filled with Evil Spaces"
-    
+    And the file "evil spaces/index.html" should contain "Spaces"
+
+
   Scenario: Preview normal file
     Given the Server is running at "indexable-app"
     When I go to "/needs_index/"
     Then I should see "Indexable"
-    
+
   Scenario: Preview normal file with spaces in filename
     Given the Server is running at "indexable-app"
-    When I go to "/evil spaces/"
-    Then I should see "Filled with Evil Spaces"
+    When I go to "/evil%20spaces/"
+    Then I should see "Spaces"
 
   Scenario: Preview normal file subdirectory
     Given the Server is running at "indexable-app"
     When I go to "/a_folder/needs_index/"
     Then I should see "Indexable"
-    
+
   Scenario: Preview ignored file
     Given the Server is running at "indexable-app"
     When I go to "/leave_me_alone/"
@@ -68,14 +69,13 @@ Feature: Directory Index
     And the Server is running at "indexable-app"
     When I go to "/link_to/"
     Then I should see 'link_to: <a href="/needs_index/">Needs Index</a>'
-    Then I should see 'explicit_link_to: <a href="/needs_index/index.html">Explicit</a>'
+    Then I should see 'explicit_link_to: <a href="/needs_index/">Explicit</a>'
     Then I should see 'unknown_link_to: <a href="/unknown.html">Unknown</a>'
     Then I should see 'relative_link_to: <a href="/needs_index/">Relative</a>'
     Then I should see 'link_to_with_spaces: <a href="/evil%20spaces/">Spaces</a>'
     When I go to "/link_to/sub/"
     Then I should see 'link_to: <a href="/needs_index/">Needs Index</a>'
-    Then I should see 'explicit_link_to: <a href="/needs_index/index.html">Explicit</a>'
+    Then I should see 'explicit_link_to: <a href="/needs_index/">Explicit</a>'
     Then I should see 'unknown_link_to: <a href="/unknown.html">Unknown</a>'
     Then I should see 'relative_link_to: <a href="/needs_index/">Relative</a>'
     Then I should see 'link_to_with_spaces: <a href="/evil%20spaces/">Spaces</a>'
-

data/features/front-matter-neighbor.feature

@@ -2,11 +2,6 @@ Feature: Neighboring YAML Front Matter
 
   Scenario: Rendering html (yaml)
     Given the Server is running at "frontmatter-neighbor-app"
-    When I go to "/front-matter-auto.html"
-    Then I should see "<h1>This is the title</h1>"
-    Then I should not see "---"
-    When I go to "/front-matter-auto.erb.frontmatter"
-    Then I should see "File Not Found"
     When I go to "/front-matter-2.php"
     Then I should see "<h1>This is the title</h1>"
     Then I should see "<?php"
@@ -38,14 +33,6 @@ Feature: Neighboring YAML Front Matter
     
   Scenario: Rendering html (json)
     Given the Server is running at "frontmatter-neighbor-app"
-    When I go to "/json-front-matter-auto.html"
-    Then I should see "<h1>This is the title</h1>"
-    Then I should not see ";;;"
-    When I go to "/json-front-matter-auto.erb.frontmatter"
-    Then I should see "File Not Found"
-    When I go to "/json-front-matter.html"
-    Then I should see "<h1>This is the title</h1>"
-    Then I should not see ";;;"
     When I go to "/json-front-matter.html.erb.frontmatter"
     Then I should see "File Not Found"
     When I go to "/json-front-matter-2.php"
@@ -149,22 +136,3 @@ Feature: Neighboring YAML Front Matter
     Then I should see "Layout in use: Override"
     When I go to "/page_mentioned.html.erb.frontmatter"
     Then I should see "File Not Found"
-
-  Scenario: Neighbor frontmatter for destination of proxy resources
-    Given the Server is running at "frontmatter-settings-neighbor-app"
-    And the file "source/proxied_with_frontmatter.html.frontmatter" has the contents
-      """
-      ---
-      title: Proxied title
-      ---
-      """
-    And the file "source/ignored.html.erb" has the contents
-      """
-      ---
-      ignored: true
-      ---
-
-      <%= current_resource.data.title %>
-      """
-    When I go to "/proxied_with_frontmatter.html"
-    Then I should see "Proxied title"

data/features/front-matter.feature

@@ -3,9 +3,6 @@ Feature: YAML Front Matter
 
   Scenario: Rendering html (yaml)
     Given the Server is running at "frontmatter-app"
-    When I go to "/front-matter-auto.html"
-    Then I should see "<h1>This is the title</h1>"
-    Then I should not see "---"
     When I go to "/front-matter-2.php"
     Then I should see "<h1>This is the title</h1>"
     Then I should see "<?php"
@@ -21,17 +18,6 @@ Feature: YAML Front Matter
     Then I should see "<?php"
     Then I should not see "---"
 
-  Scenario: Rendering markdown (template-less) (yaml)
-    Given the Server is running at "frontmatter-app"
-    When I go to "/front-matter-pandoc.html"
-    Then I should see ">This is a document</h1>"
-    Then I should see "<p>To be or not to be</p>"
-    Then I should see "The meaning of life is 42"
-    Then I should not see "..."
-    Then I should not see "layout: false"
-    Then I should not see "title: Pandoc likes trailing dots..."
-
-
   Scenario: YAML not on first line, no encoding
     Given the Server is running at "frontmatter-app"
     When I go to "/front-matter-line-2.html"
@@ -46,9 +32,6 @@ Feature: YAML Front Matter
     
   Scenario: Rendering html (json)
     Given the Server is running at "frontmatter-app"
-    When I go to "/json-front-matter-auto.html"
-    Then I should see "<h1>This is the title</h1>"
-    Then I should not see ";;;"
     When I go to "/json-front-matter.html"
     Then I should see "<h1>This is the title</h1>"
     Then I should not see ";;;"

data/features/helpers_content_tag.feature

@@ -5,8 +5,8 @@ Feature: content_tag helper
     And an empty file named "config.rb"
     And a file named "source/index.html.erb" with:
     """
-    <%= content_tag :div, "<hello>world</hello>", :class => 'one' %>
-    <% content_tag :where, :class => 'the hell is' do %>
+    <%= content_tag :div, "<hello>world</hello>", class: 'one' %>
+    <% content_tag :where, class: 'the hell is' do %>
     <my>damn croissant</my>
     <% end %>
     """

data/features/helpers_form_tag.feature

@@ -5,16 +5,16 @@ Feature: form_tag helper
     And an empty file named "config.rb"
     And a file named "source/form_tag.html.erb" with:
     """
-    absolute: <% form_tag "/needs_index.html#absolute", :relative => true do %>
+    absolute: <% form_tag "/needs_index.html#absolute", relative: true do %>
     <% end %>
-    relative: <% form_tag "needs_index.html#relative", :relative => true do %>
+    relative: <% form_tag "needs_index.html#relative", relative: true do %>
     <% end %>
     """
     And a file named "source/form_tag/sub.html.erb" with:
     """
-    absolute: <% form_tag "/needs_index.html#absolute", :relative => true do %>
+    absolute: <% form_tag "/needs_index.html#absolute", relative: true do %>
     <% end %>
-    relative: <% form_tag "../needs_index.html#relative", :relative => true do %>
+    relative: <% form_tag "../needs_index.html#relative", relative: true do %>
     <% end %>
     """
     And the Server is running at "indexable-app"

data/features/helpers_link_to.feature

@@ -5,24 +5,6 @@ Feature: link_to helper
     When I go to "/link_to_erb.html"
     Then I should see "erb <s>with html tags</s>"
 
-  Scenario: link_to works with absolute URLs (where the relative part matches a local path)
-    Given a fixture app "link-to-app"
-    And a file named "config.rb" with:
-    """
-    set :relative_links, true
-    """
-    And a file named "source/test.html.erb" with:
-    """
-    Hello
-    """
-    And a file named "source/link_to_absolute.html.erb" with:
-    """
-    <%= link_to "test", "http://google.com/test.html" %>
-    """
-    And the Server is running at "link-to-app"
-    When I go to "/link_to_absolute.html"
-    Then I should see '<a href="http://google.com/test.html">test</a>'
-
   Scenario: link_to works with blocks (slim)
     Given the Server is running at "link-to-app"
     When I go to "/link_to_slim.html"
@@ -38,13 +20,13 @@ Feature: link_to helper
     And an empty file named "config.rb"
     And a file named "source/link_to.html.erb" with:
     """
-    absolute: <%= link_to "Needs Index", "/needs_index.html", :relative => true %>
-    relative: <%= link_to "Relative", "needs_index.html", :relative => true %>
+    absolute: <%= link_to "Needs Index", "/needs_index.html", relative: true %>
+    relative: <%= link_to "Relative", "needs_index.html", relative: true %>
     """
     And a file named "source/link_to/sub.html.erb" with:
     """
-    absolute: <%= link_to "Needs Index", "/needs_index.html", :relative => true %>
-    relative: <%= link_to "Relative", "../needs_index.html", :relative => true %>
+    absolute: <%= link_to "Needs Index", "/needs_index.html", relative: true %>
+    relative: <%= link_to "Relative", "../needs_index.html", relative: true %>
     """
     And the Server is running at "indexable-app"
     When I go to "/link_to.html"
@@ -97,7 +79,7 @@ Feature: link_to helper
     And a file named "source/link_to.html.erb" with:
     """
     absolute: <%= link_to "Needs Index", "/needs_index.html" %>
-    relative: <%= link_to "Relative", "needs_index.html", :relative => false %>
+    relative: <%= link_to "Relative", "needs_index.html", relative: false %>
     unknown: <%= link_to "Unknown", "foo.html" %>
     """
     And a file named "source/link_to/sub.html.erb" with:
@@ -118,13 +100,13 @@ Feature: link_to helper
     Given a fixture app "indexable-app"
     And a file named "source/link_to.html.erb" with:
     """
-    absolute: <%= link_to "Needs Index", "/needs_index.html", :relative => true %>
-    relative: <%= link_to "Relative", "needs_index.html", :relative => true %>
+    absolute: <%= link_to "Needs Index", "/needs_index.html", relative: true %>
+    relative: <%= link_to "Relative", "needs_index.html", relative: true %>
     """
     And a file named "source/link_to/sub.html.erb" with:
     """
-    absolute: <%= link_to "Needs Index", "/needs_index.html", :relative => true %>
-    relative: <%= link_to "Relative", "../needs_index.html", :relative => true %>
+    absolute: <%= link_to "Needs Index", "/needs_index.html", relative: true %>
+    relative: <%= link_to "Relative", "../needs_index.html", relative: true %>
     """
     And the Server is running at "indexable-app"
     When I go to "/link_to/"
@@ -176,8 +158,8 @@ Feature: link_to helper
     Given a fixture app "indexable-app"
     And a file named "source/link_to.html.erb" with:
     """
-    <%= link_to "Needs Index String", "/needs_index.html", :query => "foo" %>
-    <%= link_to "Needs Index Hash", "/needs_index.html", :query => { :foo => :bar } %>
+    <%= link_to "Needs Index String", "/needs_index.html", query: "foo" %>
+    <%= link_to "Needs Index Hash", "/needs_index.html", query: { foo: :bar } %>
     """
     And the Server is running at "indexable-app"
     When I go to "/link_to/"

data/features/helpers_url_for.feature

@@ -5,13 +5,13 @@ Feature: url_for helper
     And an empty file named "config.rb"
     And a file named "source/url_for.html.erb" with:
     """
-    absolute: <%= url_for "/needs_index.html", :relative => true %>
-    relative: <%= url_for "needs_index.html", :relative => true %>
+    absolute: <%= url_for "/needs_index.html", relative: true %>
+    relative: <%= url_for "needs_index.html", relative: true %>
     """
     And a file named "source/url_for/sub.html.erb" with:
     """
-    absolute: <%= url_for "/needs_index.html", :relative => true %>
-    relative: <%= url_for "../needs_index.html", :relative => true %>
+    absolute: <%= url_for "/needs_index.html", relative: true %>
+    relative: <%= url_for "../needs_index.html", relative: true %>
     """
     And the Server is running at "indexable-app"
     When I go to "/url_for.html"
@@ -64,7 +64,7 @@ Feature: url_for helper
     And a file named "source/url_for.html.erb" with:
     """
     absolute: <%= url_for "/needs_index.html" %>
-    relative: <%= url_for "needs_index.html", :relative => false %>
+    relative: <%= url_for "needs_index.html", relative: false %>
     unknown: <%= url_for "foo.html" %>
     """
     And a file named "source/url_for/sub.html.erb" with:
@@ -85,13 +85,13 @@ Feature: url_for helper
     Given a fixture app "indexable-app"
     And a file named "source/url_for.html.erb" with:
     """
-    absolute: <%= url_for "/needs_index.html", :relative => true %>
-    relative: <%= url_for "needs_index.html", :relative => true %>
+    absolute: <%= url_for "/needs_index.html", relative: true %>
+    relative: <%= url_for "needs_index.html", relative: true %>
     """
     And a file named "source/url_for/sub.html.erb" with:
     """
-    absolute: <%= url_for "/needs_index.html", :relative => true %>
-    relative: <%= url_for "../needs_index.html", :relative => true %>
+    absolute: <%= url_for "/needs_index.html", relative: true %>
+    relative: <%= url_for "../needs_index.html", relative: true %>
     """
     And the Server is running at "indexable-app"
     When I go to "/url_for/"
@@ -143,8 +143,8 @@ Feature: url_for helper
     Given a fixture app "indexable-app"
     And a file named "source/url_for.html.erb" with:
     """
-    Needs Index String <%= url_for "/needs_index.html", :query => "foo" %>
-    Needs Index Hash <%= url_for "/needs_index.html", :query => { :foo => :bar } %>
+    Needs Index String <%= url_for "/needs_index.html", query: "foo" %>
+    Needs Index Hash <%= url_for "/needs_index.html", query: { foo: :bar } %>
     """
     And the Server is running at "indexable-app"
     When I go to "/url_for/"

data/features/i18n_builder.feature

@@ -49,7 +49,7 @@ Feature: i18n Builder
     Given a fixture app "i18n-test-app"
     And a file named "config.rb" with:
       """
-      activate :i18n, :path => "/lang_:locale/"
+      activate :i18n, path: "/lang_:locale/"
       """
     Given a successfully built app at "i18n-test-app"
     When I cd to "build"
@@ -69,7 +69,7 @@ Feature: i18n Builder
     Given a fixture app "i18n-alt-root-app"
     And a file named "config.rb" with:
       """
-      activate :i18n, :templates_dir => "lang_data"
+      activate :i18n, templates_dir: "lang_data"
       """
     Given a successfully built app at "i18n-alt-root-app"
     When I cd to "build"
@@ -89,7 +89,7 @@ Feature: i18n Builder
     Given a fixture app "i18n-test-app"
     And a file named "config.rb" with:
       """
-      activate :i18n, :lang_map => { :en => :english, :es => :spanish }
+      activate :i18n, lang_map: { en: :english, es: :spanish }
       """
     Given a successfully built app at "i18n-test-app"
     When I cd to "build"
@@ -109,7 +109,7 @@ Feature: i18n Builder
     Given a fixture app "i18n-test-app"
     And a file named "config.rb" with:
       """
-      activate :i18n, :mount_at_root => false
+      activate :i18n, mount_at_root: false
       """
     Given a successfully built app at "i18n-test-app"
     When I cd to "build"
@@ -130,7 +130,7 @@ Feature: i18n Builder
     Given a fixture app "i18n-test-app"
     And a file named "config.rb" with:
       """
-      activate :i18n, :langs => [:en]
+      activate :i18n, langs: [:en]
       """
     Given a successfully built app at "i18n-test-app"
     When I cd to "build"