middleman-core 3.3.12 → 4.4.2

data/features/directory_index.feature

@@ -9,6 +9,7 @@ Feature: Directory Index
       | a_folder/needs_index/index.html               |
       | leave_me_alone.html                           |
       | wildcard_leave_me_alone.html                  |
+      | regex_leave_me_alone2.html                    |
       | evil spaces/index.html                        |
       | regular/index.html                            |
       | .htaccess                                     |
@@ -21,17 +22,18 @@ Feature: Directory Index
       | a_folder/needs_index.html                     |
       | leave_me_alone/index.html                     |
       | wildcard_leave_me_alone/index.html            |
+      | regex_leave_me_alone2/index.html              |
     And the file "needs_index/index.html" should contain "Indexable"
     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"
-    
+
   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/"
@@ -41,7 +43,7 @@ Feature: Directory Index
     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 +70,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/dynamic_pages.feature

@@ -31,7 +31,8 @@ Feature: Dynamic Pages
       | should_be_ignored6.html                       |
       | should_be_ignored7.html                       |
       | should_be_ignored8.html                       |
-    
+      | should_be_ignored9.html                       |
+
   Scenario: Preview basic proxy
     Given the Server is running at "dynamic-pages-app"
     When I go to "/fake.html"
@@ -42,46 +43,46 @@ Feature: Dynamic Pages
     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 "dynamic-pages-app"
     When I go to "/fake/one.html"
     Then I should see "I am real: one"
     Then I should see "Global: I am one glob"
     Then I should see "All: I am all glob"
-    
+
     When I go to "/fake2/one.html"
     Then I should see "I am real: one"
     Then I should see "Global: I am two glob"
     Then I should see "All: I am all glob"
-    
+
     When I go to "/fake3/one.html"
     Then I should see "I am real: one"
     Then I should see "Global: I am three glob"
     Then I should see "All: I am all glob"
-    
+
     When I go to "/fake4/one.html"
     Then I should see "I am real: one"
     Then I should see "Global: I am four glob"
     Then I should see "All: I am all glob"
-    
+
   Scenario: Preview proxy with variable two
     Given the Server is running at "dynamic-pages-app"
     When I go to "/fake/two.html"
     Then I should see "I am real: two"
     Then I should see "Global: I am one glob"
     Then I should see "All: I am all glob"
-    
+
     When I go to "/fake2/two.html"
     Then I should see "I am real: two"
     Then I should see "Global: I am two glob"
     Then I should see "All: I am all glob"
-    
+
     When I go to "/fake3/two.html"
     Then I should see "I am real: two"
     Then I should see "Global: I am three glob"
     Then I should see "All: I am all glob"
-    
+
     When I go to "/fake4/two.html"
     Then I should see "I am real: two"
     Then I should see "Global: I am four glob"
@@ -101,7 +102,7 @@ Feature: Dynamic Pages
     Then the file "fake3/one.html" should contain "I am real: one"
     Then the file "fake3/one.html" should contain "Global: I am three glob"
     Then the file "fake3/one.html" should contain "All: I am all glob"
-    
+
   Scenario: Target ignore
     Given the Server is running at "dynamic-pages-app"
     When I go to "/target_ignore.html"
@@ -112,7 +113,7 @@ Feature: Dynamic Pages
     Then I should see "Ignore me! 7"
     When I go to "/target_ignore4.html"
     Then I should see "Ignore me! 8"
-    
+
   Scenario: Preview ignored paths
     Given the Server is running at "dynamic-pages-app"
     When I go to "/should_be_ignored.html"
@@ -130,4 +131,6 @@ Feature: Dynamic Pages
     When I go to "/should_be_ignored7.html"
     Then I should see "File Not Found"
     When I go to "/should_be_ignored8.html"
-    Then I should see "File Not Found"
+    Then I should see "File Not Found"
+    When I go to "/should_be_ignored9.html"
+    Then I should see "File Not Found"

data/features/encoding_option.feature

@@ -0,0 +1,28 @@
+# encoding: iso-8859-1
+Feature: encoding option
+
+  Scenario: No encoding set
+    Given a fixture app "clean-app"
+    Given the Server is running at "clean-app"
+
+    When I go to "/index.html"
+    Then the "Content-Type" header should contain "text/html"
+    Then the "Content-Type" header should contain "charset=utf-8"
+
+  @wip
+  Scenario: Custom encoding set
+    Given a fixture app "i-8859-1-app"
+    And a file named "config.rb" with:
+      """
+      set :encoding, "ISO-8859-1"
+
+      ::Rack::Mime::MIME_TYPES['.html'] = 'text/html; charset=iso-8859-1'
+      ::Rack::Mime::MIME_TYPES['.htm'] = 'text/html; charset=iso-8859-1'
+      ::Rack::Mime::MIME_TYPES['.map'] = 'application/json; charset=iso-8859-1'
+      """
+    Given the Server is running at "i-8859-1-app"
+
+    When I go to "/index.html"
+    Then the "Content-Type" header should contain "text/html"
+    Then the "Content-Type" header should contain "charset=iso-8859-1"
+    Then I should see "äöü"

data/features/extension_api_deprecations.feature

@@ -0,0 +1,10 @@
+Feature: Extension author could use some hooks
+
+  Scenario: When build
+    Given a fixture app "extension-api-deprecations-app"
+    When I run `middleman build`
+    Then the exit status should be 0
+    And the output should contain "`set :layout` is deprecated"
+    And the file "build/index.html" should contain "In Index"
+    And the file "build/index.html" should not contain "In Layout"
+

data/features/extension_hooks.feature

@@ -0,0 +1,13 @@
+Feature: Extension author could use some hooks
+
+  Scenario: When build
+    Given a fixture app "extension-hooks-app"
+    When I run `middleman build`
+    Then the exit status should be 0
+    And the output should contain "/// after_configuration ///"
+    And the output should contain "/// ready ///"
+    And the output should contain "/// before_build ///"
+    And the output should contain "/// before ///"
+    And the output should contain "/// before_render ///"
+    And the output should contain "/// after_render ///"
+    And the output should contain "/// after_build ///"

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"
@@ -27,7 +22,13 @@ Feature: Neighboring YAML Front Matter
     Then I should not see "---"
     When I go to "/raw-front-matter.php.frontmatter"
     Then I should see "File Not Found"
-    
+
+  Scenario: Rendering raw (template-less) (toml)
+    Given the Server is running at "frontmatter-neighbor-app"
+    When I go to "/raw-front-matter-toml.html"
+    Then I should see "<h1><%= current_page.data.title %></h1>"
+    Then I should not see "---"
+
   Scenario: YAML not on first line, with encoding
     Given the Server is running at "frontmatter-neighbor-app"
     When I go to "/front-matter-encoding.html"
@@ -35,31 +36,12 @@ Feature: Neighboring YAML Front Matter
     Then I should not see "---"
     When I go to "/front-matter-encoding.html.erb.frontmatter"
     Then I should see "File Not Found"
-    
-  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"
-    Then I should see "<h1>This is the title</h1>"
-    Then I should see "<?php"
-    Then I should not see ";;;"
-    When I go to "/json-front-matter-2.php.erb.frontmatter"
-    Then I should see "File Not Found"
 
   Scenario: A template changes frontmatter during preview
     Given the Server is running at "frontmatter-neighbor-app"
     And the file "source/front-matter-change.html.erb" has the contents
       """
-      <%= current_page.data.title %>
+      FileA <%= current_page.data.title %>
       """
     And the file "source/front-matter-change.html.erb.frontmatter" has the contents
       """
@@ -67,6 +49,8 @@ Feature: Neighboring YAML Front Matter
       title: Hello World
       layout: false
       ---
+
+      FileB
       """
     When I go to "/front-matter-change.html"
     Then I should see "Hello World"
@@ -76,6 +60,8 @@ Feature: Neighboring YAML Front Matter
       title: Hola Mundo
       layout: false
       ---
+
+      FileC
       """
     When I go to "/front-matter-change.html"
     Then I should see "Hola Mundo"
@@ -85,10 +71,10 @@ Feature: Neighboring YAML Front Matter
   Scenario: A template should handle an empty YAML feed
     Given the Server is running at "frontmatter-neighbor-app"
     And the file "source/front-matter-change.html.erb.frontmatter" has the contents
-    """
-    ---
-    ---
-    """
+      """
+      ---
+      ---
+      """
     When I go to "/front-matter-change.html"
     Then I should not see "Hello World"
     Then I should not see "Hola Mundo"
@@ -98,14 +84,14 @@ Feature: Neighboring YAML Front Matter
   Scenario: Setting layout, ignoring, and disabling directory indexes through frontmatter (build)
     Given a successfully built app at "frontmatter-settings-neighbor-app"
     Then the following files should exist:
-      | build/proxied.html  |
+      | build/proxied.html |
     And the file "build/alternate_layout.html" should contain "Alternate layout"
     And the following files should not exist:
-      | build/ignored.html  |
-      | build/alternate_layout.html.erb.frontmatter  |
-      | build/ignored.html.erb.frontmatter  |
+      | build/ignored.html                          |
+      | build/alternate_layout.html.erb.frontmatter |
+      | build/ignored.html.erb.frontmatter          |
       | build/override_layout.html.erb.frontmatter  |
-      | build/page_mentioned.html.erb.frontmatter  |
+      | build/page_mentioned.html.erb.frontmatter   |
 
   Scenario: Setting layout, ignoring, and disabling directory indexes through frontmatter (preview)
     Given the Server is running at "frontmatter-settings-neighbor-app"
@@ -150,21 +136,22 @@ Feature: Neighboring YAML Front Matter
     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
-      ---
+# 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"
+#     <%= current_resource.data.inspect %>
+#     <%= 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"
@@ -31,43 +28,23 @@ Feature: YAML Front Matter
     Then I should not see "layout: false"
     Then I should not see "title: Pandoc likes trailing dots..."
 
+  Scenario: Rendering Haml (yaml)
+    Given the Server is running at "frontmatter-app"
+    When I go to "/front-matter-haml.html"
+    Then I should see "<h1>This is the title</h1>"
+    Then I should not see "---"
 
   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"
     Then I should see "<h1></h1>"
     Then I should see "---"
-    
+
   Scenario: YAML not on first line, with encoding
     Given the Server is running at "frontmatter-app"
     When I go to "/front-matter-encoding.html"
     Then I should see "<h1>This is the title</h1>"
     Then I should not see "---"
-    
-  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 ";;;"
-    When I go to "/json-front-matter-2.php"
-    Then I should see "<h1>This is the title</h1>"
-    Then I should see "<?php"
-    Then I should not see ";;;"
-
-  Scenario: JSON not on first line, no encoding
-    Given the Server is running at "frontmatter-app"
-    When I go to "/json-front-matter-line-2.html"
-    Then I should see "<h1></h1>"
-    Then I should see ";;;"
-    
-  Scenario: JSON not on first line, with encoding
-    Given the Server is running at "frontmatter-app"
-    When I go to "/json-front-matter-encoding.html"
-    Then I should see "<h1>This is the title</h1>"
-    Then I should not see ";;;"
 
   Scenario: A template changes frontmatter during preview
     Given the Server is running at "frontmatter-app"
@@ -95,10 +72,16 @@ Feature: YAML Front Matter
   Scenario: A template should handle an empty YAML feed
     Given the Server is running at "frontmatter-app"
     And the file "source/front-matter-change.html.erb" has the contents
-    """
-    ---
-    ---
-    Hello World
-    """
+      """
+      ---
+      ---
+      Hello World
+      """
     When I go to "/front-matter-change.html"
     Then I should see "Hello World"
+
+  Scenario: Rendering raw (template-less) (toml)
+    Given the Server is running at "frontmatter-app"
+    When I go to "/raw-front-matter-toml.html"
+    Then I should see "<h1><%= current_page.data.title %></h1>"
+    Then I should not see "---"

data/features/gzip.feature

@@ -22,7 +22,7 @@ Feature: GZIP assets during build
     Given a fixture app "gzip-app"
     And a file named "config.rb" with:
       """
-      activate :gzip, exts: %w(.js .html .htm)
+      activate :gzip, exts: %w(.htm .html .js .xhtml)
       """
     And a successfully built app at "gzip-app"
     Then the following files should exist:

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

@@ -38,21 +38,31 @@ 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 %>
+
+    absolute spaces: <%= link_to "Spaces Index", "/evil spaces.html", relative: true %>
+    relative spaces: <%= link_to "Spaces Relative", "evil spaces.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 %>
+
+    absolute spaces: <%= link_to "Spaces Index", "/evil spaces.html", relative: true %>
+    relative spaces: <%= link_to "Spaces Relative", "../evil spaces.html", relative: true %>
     """
     And the Server is running at "indexable-app"
     When I go to "/link_to.html"
     Then I should see 'absolute: <a href="needs_index.html">Needs Index</a>'
     Then I should see 'relative: <a href="needs_index.html">Relative</a>'
+    Then I should see 'absolute spaces: <a href="evil%20spaces.html">Spaces Index</a>'
+    Then I should see 'relative spaces: <a href="evil%20spaces.html">Spaces Relative</a>'
     When I go to "/link_to/sub.html"
     Then I should see 'absolute: <a href="../needs_index.html">Needs Index</a>'
     Then I should see 'relative: <a href="../needs_index.html">Relative</a>'
+    Then I should see 'absolute spaces: <a href="../evil%20spaces.html">Spaces Index</a>'
+    Then I should see 'relative spaces: <a href="../evil%20spaces.html">Spaces Relative</a>'
 
   Scenario: link_to relative works with strip_index_file
     Given a fixture app "indexable-app"
@@ -97,7 +107,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:
@@ -113,18 +123,18 @@ Feature: link_to helper
     When I go to "/link_to/sub.html"
     Then I should see 'absolute: <a href="../needs_index.html">Needs Index</a>'
     Then I should see 'relative: <a href="../needs_index.html">Relative</a>'
-  
+
   Scenario: link_to knows about directory indexes
     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 +186,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/"