Adapt to style changes and removal of on

2015-11-11 15:30:26 -08:00 · 2015-11-11 15:30:26 -08:00 · 37d96a9b14
parent 169b6f2c0a
commit 37d96a9b14
7 changed files with 27 additions and 27 deletions
--- a/middleman-core/features/asset_hash.feature
+++ b/middleman-core/features/asset_hash.feature
@ -63,21 +63,21 @@ Feature: Assets get file hashes appended to them and references to them are upda
    Given the Server is running at "asset-hash-app"
    When I go to "/"
    Then I should see 'href="apple-touch-icon.png"'
-    And I should see 'href="stylesheets/site-c876f66c.css"'
+    And I should see 'href="stylesheets/site-d2959d87.css"'
    And I should see 'src="javascripts/application-1d8d5276.js"'
    And I should see 'src="images/100px-5fd6fb90.jpg"'
    And I should see 'srcset="images/100px-5fd6fb90.jpg 1x, images/200px-c11eb203.jpg 2x, images/300px-59adce76.jpg 3x"'
    When I go to "/subdir/"
-    Then I should see 'href="../stylesheets/site-c876f66c.css"'
+    Then I should see 'href="../stylesheets/site-d2959d87.css"'
    And I should see 'src="../javascripts/application-1d8d5276.js"'
    And I should see 'src="../images/100px-5fd6fb90.jpg"'
    When I go to "/other/"
-    Then I should see 'href="../stylesheets/site-c876f66c.css"'
+    Then I should see 'href="../stylesheets/site-d2959d87.css"'
    And I should see 'src="../javascripts/application-1d8d5276.js"'
    And I should see 'src="../images/100px-5fd6fb90.jpg"'
    When I go to "/javascripts/application-1d8d5276.js"
    Then I should see "img.src = '/images/100px-5fd6fb90.jpg'"
-    When I go to "/stylesheets/site-c876f66c.css"
+    When I go to "/stylesheets/site-d2959d87.css"
    Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg")'
    When I go to "/api.json"
    Then I should see 'images/100px-5fd6fb90.gif'
@ -98,13 +98,13 @@ Feature: Assets get file hashes appended to them and references to them are upda
  Scenario: Enabling an asset host still produces hashed files and references
    Given the Server is running at "asset-hash-host-app"
    When I go to "/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-d3eb6c92.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-e587b659.css"'
    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
    When I go to "/subdir/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-d3eb6c92.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-e587b659.css"'
    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
    When I go to "/other/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-d3eb6c92.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-e587b659.css"'
    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'

  Scenario: The asset hash should change when a SASS partial changes
@ -115,14 +115,14 @@ Feature: Assets get file hashes appended to them and references to them are upda
        font-size: 14px
      """
    When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-e1b802a2.css'
+    Then I should see 'href="../stylesheets/uses_partials-44fb2764.css'
    And the file "source/stylesheets/_partial.sass" has the contents
      """
      body
        font-size: 18px !important
      """
    When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-023a2e4d.css'
+    Then I should see 'href="../stylesheets/uses_partials-10d8ae33.css'

  Scenario: The asset hash should change when a Rack-based filter changes
    Given a fixture app "asset-hash-app"
@ -136,8 +136,8 @@ Feature: Assets get file hashes appended to them and references to them are upda
      """
    Given the Server is running at "asset-hash-app"
    When I go to "/"
-    Then I should see 'href="stylesheets/site-79a70922.css'
-    When I go to "stylesheets/site-79a70922.css"
+    Then I should see 'href="stylesheets/site-30784643.css'
+    When I go to "stylesheets/site-30784643.css"
    Then I should see 'background-image'
    Then I should see 'Added by Rack filter'
    When I go to "stylesheets/site-7474cadd.css"
--- a/middleman-core/features/minify_css.feature
+++ b/middleman-core/features/minify_css.feature
@ -154,7 +154,7 @@ Feature: Minify CSS
      """
      config[:sass_source_maps] = false

-      activate :minify_css, :inline => true
+      activate :minify_css, inline: true
      """
    And the Server is running at "minify-css-app"
    When I go to "/inline-css.php"
@ -173,7 +173,7 @@ Feature: Minify CSS
      """
      config[:sass_source_maps] = false

-      activate :minify_css, :inline => true
+      activate :minify_css, inline: true
      proxy '/inline-css-proxy', '/inline-css.html', ignore: true
      """
    And the Server is running at "minify-css-app"
--- a/middleman-core/features/minify_javascript.feature
+++ b/middleman-core/features/minify_javascript.feature
@ -150,7 +150,7 @@ Feature: Minify Javascript
    Given a fixture app "minify-js-app"
    And a file named "config.rb" with:
      """
-      activate :minify_javascript, :inline => true
+      activate :minify_javascript, inline: true
      """
    And the Server is running at "minify-js-app"
    When I go to "/inline-js.php"
@ -175,7 +175,7 @@ Feature: Minify Javascript
    Given a fixture app "minify-js-app"
    And a file named "config.rb" with:
      """
-      activate :minify_javascript, :inline => true
+      activate :minify_javascript, inline: true
      proxy '/inline-js-proxy', '/inline-js.html', ignore: true
      """
    And the Server is running at "minify-js-app"
--- a/middleman-core/fixtures/clean-app/config-hidden-dir-after.rb
+++ b/middleman-core/fixtures/clean-app/config-hidden-dir-after.rb
@ -1,5 +1,5 @@
 set :build_dir, ".build"

 ignore "/should_be_ignored.html"
-page "/should_be_ignored2.html", :ignore => true
-page "/target_ignore.html", :proxy => "/should_be_ignored3.html", :ignore => true
+ignore "/should_be_ignored2.html"
+proxy "/target_ignore.html", "/should_be_ignored3.html", ignore: true
--- a/middleman-core/fixtures/partials-app/source/locals.html.erb
+++ b/middleman-core/fixtures/partials-app/source/locals.html.erb
@ -1 +1 @@
-<%= partial 'locals', locals: { :foo => 'bar' } %>
+<%= partial 'locals', locals: { foo: 'bar' } %>
--- a/middleman-core/fixtures/preview-server-app/bin/dns_server.rb
+++ b/middleman-core/fixtures/preview-server-app/bin/dns_server.rb
@ -24,7 +24,7 @@ interfaces = [


 # Start the RubyDNS server
-RubyDNS::run_server(:listen => interfaces) do
+RubyDNS::run_server(listen: interfaces) do
  db.each do |matcher, result|
    match(matcher, Resolv::DNS::Resource::IN::A) do |transaction|
      transaction.respond!(result)
--- a/middleman-core/lib/middleman-core/core_extensions/routing.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/routing.rb
@ -28,7 +28,7 @@ module Middleman
      PageDescriptor = Struct.new(:path, :metadata)

      # The page method allows options to be set for a given source path, regex, or glob.
-      # Options that may be set include layout, locals, proxy, andx ignore.
+      # Options that may be set include layout, locals, andx ignore.
      #
      # @example
      #   page '/about.html', layout: false