middleman-core 4.0.0.rc.1 → 4.0.0.rc.2

data/features/cli_init.feature

@@ -57,11 +57,11 @@ Feature: Middleman CLI
     Then a directory named "MY_PROJECT" should exist
 
   Scenario: Create a new project using Middleman directory
-    When I run `middleman init MY_PROJECT -T amicus`
+    When I run `middleman init MY_PROJECT -T blog`
     Then a directory named "MY_PROJECT" should exist
     When I cd to "MY_PROJECT"
-    And the file "README.md" should contain "Amicus"
-    And the file ".gitignore" should not exist
+    And the file "Gemfile" should contain "middleman-blog"
+    And the file ".gitignore" should exist
 
   Scenario: Create a new project using github(user/repository)
     When I run `middleman init MY_PROJECT -T middleman/middleman-templates-default` interactively

data/features/collections.feature

@@ -197,13 +197,15 @@ Feature: Collections
     Given a fixture app "collections-app"
     And a file named "config.rb" with:
       """
+      ignore "/description_template.html"
+
       live {
-        Dir["descriptions/*.txt"]
+        Dir[File.join(root, "descriptions/*.txt")]
       }.each do |description_name|
         base = File.basename(description_name, '.txt')
         proxy "#{base}.html", "/description_template.html", locals: {
           contents: File.read(description_name)
-        }, ignore: true
+        }
       end
       """
     And a file named "source/description_template.html.erb" with:
@@ -233,4 +235,4 @@ Feature: Collections
     When I go to "test1.html"
     Then I should see 'Not Found'
     When I go to "test2.html"
-    Then I should see 'Test2'
+    Then I should see 'Test2'

data/features/content_type.feature

@@ -12,6 +12,8 @@ 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"
@@ -31,6 +33,7 @@ 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/default-layout.feature

@@ -0,0 +1,90 @@
+Feature: Describe which files get layouts
+
+  Background:
+    Given an empty app
+    And a file named "config.rb" with:
+      """
+      page "/about.html", layout: :layout2
+      """
+    And a file named "source/layouts/layout.erb" with:
+      """
+      In Layout
+      <%= yield %>
+      """
+    And a file named "source/layouts/layout2.erb" with:
+      """
+      <root>
+        <title>Second Layout</title>
+        <%= yield %>
+      </root>
+      """
+    And a file named "source/index.html.erb" with:
+      """
+      In Index
+      """
+    And a file named "source/about.html.erb" with:
+      """
+      In About
+      """
+    And a file named "source/style.css.scss" with:
+      """
+      html { border: 1; }
+      """
+    And a file named "source/style2.scss" with:
+      """
+      html { border: 2; }
+      """
+    And a file named "source/data.json" with:
+      """
+      { "hello": "world" }
+      """
+    And a file named "source/script.js" with:
+      """
+      helloWorld();
+      """
+    And a file named "source/test.xml.erb" with:
+      """
+      ---
+      layout: layout2
+      ---
+
+      <test>Hi</test>
+      """
+    And the Server is running at "empty_app"
+
+  Scenario: Normal Template
+    When I go to "/index.html"
+    Then I should see "In Index"
+    And I should see "In Layout"
+
+  Scenario: Normal Template with override
+    When I go to "/about.html"
+    Then I should see "In About"
+    And I should see "Second Layout"
+    And I should not see "In Layout"
+
+  Scenario: Sass
+    When I go to "/style.css"
+    Then I should see "border: 1"
+    And I should not see "In Layout"
+
+  Scenario: Sass with extension
+    When I go to "/style2"
+    Then I should see "border: 2"
+    And I should not see "In Layout"
+
+  Scenario: JSON
+    When I go to "/data.json"
+    Then I should see "hello"
+    And I should not see "In Layout"
+
+  Scenario: JS
+    When I go to "/script.js"
+    Then I should see "helloWorld()"
+    And I should not see "In Layout"
+
+  Scenario: XML
+    When I go to "/test.xml"
+    Then I should see "<test>Hi</test>"
+    And I should see "<title>Second Layout</title>"
+

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/front-matter.feature

@@ -28,13 +28,18 @@ 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"

data/features/i18n_link_to.feature

@@ -0,0 +1,209 @@
+Feature: i18n Paths
+
+  Scenario: link_to is i18n aware
+    Given a fixture app "empty-app"
+    And a file named "data/pages.yml" with:
+      """
+      - hello.html 
+      """
+    And a file named "locales/en.yml" with:
+      """
+      ---
+      en:
+        msg: Hello
+        home: Home
+      """
+    And a file named "locales/es.yml" with:
+      """
+      ---
+      es:
+        paths:
+          hello: "hola"
+        msg: Hola
+        home: Casa
+      """
+    And a file named "source/localizable/index.html.erb" with:
+      """
+      Page: <%= t(:hom) %>
+      """
+    And a file named "source/localizable/hello.html.erb" with:
+      """
+      Page: <%= t(:msg) %>
+
+      <%= link_to "Current Home", "/index.html", class: 'current' %>
+      <%= link_to "Other Home", "/index.html", title: "Other Home", locale: ::I18n.locale == :en ? :es : :en %>
+      <% link_to "/index.html", class: 'current' do %><span>Home: Current Block</span><% end %>
+      <% link_to "/index.html", title: "Other Home", locale: ::I18n.locale == :en ? :es : :en do %><span>Home: Other Block</span><% end %>
+
+      <% data.pages.each_with_index do |p, i| %>
+        <%= link_to "Current #{p}", "/#{p}", class: 'current' %>
+        <%= link_to "Other #{p}", "/#{p}", title: "Other #{p}", locale: ::I18n.locale == :en ? :es : :en %>
+        <% link_to "/#{p}", class: 'current' do %><span>Current Block</span><% end %>
+        <% link_to "/#{p}", title: "Other #{p}", locale: ::I18n.locale == :en ? :es : :en do %><span>Other Block</span><% end %>
+      <% end %>
+      """
+    And a file named "config.rb" with:
+      """
+      set :strip_index_file, false
+      activate :i18n, mount_at_root: :en
+      """
+    Given the Server is running at "empty-app"
+    When I go to "/hello.html"
+    Then I should see "Page: Hello"
+    Then I should see '<a class="current" href="/index.html">Current Home</a>'
+    Then I should see '<a title="Other Home" href="/es/index.html">Other Home</a>'
+    Then I should see '<a class="current" href="/index.html"><span>Home: Current Block</span></a>'
+    Then I should see '<a title="Other Home" href="/es/index.html"><span>Home: Other Block</span></a>'
+    Then I should see '<a class="current" href="/hello.html">Current hello.html</a>'
+    Then I should see '<a title="Other hello.html" href="/es/hola.html">Other hello.html</a>'
+    Then I should see '<a class="current" href="/hello.html"><span>Current Block</span></a>'
+    Then I should see '<a title="Other hello.html" href="/es/hola.html"><span>Other Block</span></a>'
+    When I go to "/es/hola.html"
+    Then I should see "Page: Hola"
+    Then I should see '<a class="current" href="/es/index.html">Current Home</a>'
+    Then I should see '<a title="Other Home" href="/index.html">Other Home</a>'
+    Then I should see '<a class="current" href="/es/index.html"><span>Home: Current Block</span></a>'
+    Then I should see '<a title="Other Home" href="/index.html"><span>Home: Other Block</span></a>'
+    Then I should see '<a class="current" href="/es/hola.html">Current hello.html</a>'
+    Then I should see '<a title="Other hello.html" href="/hello.html">Other hello.html</a>'
+    Then I should see '<a class="current" href="/es/hola.html"><span>Current Block</span></a>'
+    Then I should see '<a title="Other hello.html" href="/hello.html"><span>Other Block</span></a>'
+
+  Scenario: link_to is i18n aware and supports relative_links
+    Given a fixture app "empty-app"
+    And a file named "locales/en.yml" with:
+      """
+      ---
+      en:
+        msg: Hello
+        home: Home
+      """
+    And a file named "locales/es.yml" with:
+      """
+      ---
+      es:
+        paths:
+          hello: "hola"
+        msg: Hola
+        home: Casa
+      """
+    And a file named "source/assets/css/main.css.scss" with:
+      """
+      $color: red;
+      body { background: $color; }
+      """
+    And a file named "source/localizable/index.html.erb" with:
+      """
+      Page: <%= t(:home) %>
+      <%= stylesheet_link_tag :main %>
+      """
+    And a file named "source/localizable/hello.html.erb" with:
+      """
+      Page: <%= t(:msg) %>
+
+      <%= link_to "Current Home", "/index.html", class: 'current' %>
+      <%= link_to "Other Home", "/index.html", title: "Other Home", locale: ::I18n.locale == :en ? :es : :en %>
+      <% link_to "/index.html", class: 'current' do %><span>Home: Current Block</span><% end %>
+      <% link_to "/index.html", title: "Other Home", locale: ::I18n.locale == :en ? :es : :en do %><span>Home: Other Block</span><% end %>
+
+      <%= link_to "Current hello.html", "/hello.html", class: 'current' %>
+      <%= link_to "Other hello.html", "/hello.html", title: "Other hello.html", locale: ::I18n.locale == :en ? :es : :en %>
+      <% link_to "/hello.html", class: 'current' do %><span>Current Block</span><% end %>
+      <% link_to "/hello.html", title: "Other hello.html", locale: ::I18n.locale == :en ? :es : :en do %><span>Other Block</span><% end %>
+      """
+    And a file named "config.rb" with:
+      """
+      set :css_dir, 'assets/css'
+      set :relative_links, true
+      set :strip_index_file, false
+      activate :i18n, mount_at_root: :en
+      activate :relative_assets
+      """
+    Given the Server is running at "empty-app"
+    When I go to "/index.html"
+    Then I should see "assets/css/main.css"
+    When I go to "/hello.html"
+    Then I should see "Page: Hello"
+    Then I should see '<a class="current" href="index.html">Current Home</a>'
+    Then I should see '<a title="Other Home" href="es/index.html">Other Home</a>'
+    Then I should see '<a class="current" href="index.html"><span>Home: Current Block</span></a>'
+    Then I should see '<a title="Other Home" href="es/index.html"><span>Home: Other Block</span></a>'
+    Then I should see '<a class="current" href="hello.html">Current hello.html</a>'
+    Then I should see '<a title="Other hello.html" href="es/hola.html">Other hello.html</a>'
+    Then I should see '<a class="current" href="hello.html"><span>Current Block</span></a>'
+    Then I should see '<a title="Other hello.html" href="es/hola.html"><span>Other Block</span></a>'
+    When I go to "/es/hola.html"
+    Then I should see "Page: Hola"
+    Then I should see '<a class="current" href="index.html">Current Home</a>'
+    Then I should see '<a title="Other Home" href="../index.html">Other Home</a>'
+    Then I should see '<a class="current" href="index.html"><span>Home: Current Block</span></a>'
+    Then I should see '<a title="Other Home" href="../index.html"><span>Home: Other Block</span></a>'
+    Then I should see '<a class="current" href="hola.html">Current hello.html</a>'
+    Then I should see '<a title="Other hello.html" href="../hello.html">Other hello.html</a>'
+    Then I should see '<a class="current" href="hola.html"><span>Current Block</span></a>'
+    Then I should see '<a title="Other hello.html" href="../hello.html"><span>Other Block</span></a>'
+
+  Scenario: url_for is i18n aware
+    Given a fixture app "empty-app"
+    And a file named "data/pages.yml" with:
+      """
+      - hello.html 
+      - article.html
+      """
+    And a file named "locales/en.yml" with:
+      """
+      ---
+      en:
+        msg: Hello
+      """
+    And a file named "locales/es.yml" with:
+      """
+      ---
+      es:
+        paths:
+          hello: "hola"
+        msg: Hola
+      """
+    And a file named "source/localizable/hello.html.erb" with:
+      """
+      Page: <%= t(:msg) %>
+      <% data.pages.each_with_index do |p, i| %>
+        Current: <%= url_for "/#{p}" %>
+        Other: <%= url_for "/#{p}", locale: ::I18n.locale == :en ? :es : :en %>
+      <% end %>
+      """
+    And a file named "source/localizable/article.html.erb" with:
+      """
+      Page Lang: Default
+
+      Current: <%= url_for "/article.html" %>
+      Other: <%= url_for "/article.html", locale: ::I18n.locale == :en ? :es : :en %>
+      """
+    And a file named "source/localizable/article.es.html.erb" with:
+      """
+      Page Lang: Spanish
+
+      Current: <%= url_for "/article.html" %>
+      Other: <%= url_for "/article.html", locale: :en %>
+      """
+    And a file named "config.rb" with:
+      """
+      activate :i18n, mount_at_root: :en
+      """
+    Given the Server is running at "empty-app"
+    When I go to "/hello.html"
+    Then I should see "Page: Hello"
+    Then I should see 'Current: /hello.html'
+    Then I should see 'Other: /es/hola.html'
+    When I go to "/es/hola.html"
+    Then I should see "Page: Hola"
+    Then I should see 'Current: /es/hola.html'
+    Then I should see 'Other: /hello.html'
+    When I go to "/article.html"
+    Then I should see "Page Lang: Default"
+    Then I should see 'Current: /article.html'
+    Then I should see 'Other: /es/article.html'
+    When I go to "/es/article.html"
+    Then I should see "Page Lang: Spanish"
+    Then I should see 'Current: /es/article.html'
+    Then I should see 'Other: /article.html'

data/features/import_files.feature

@@ -0,0 +1,17 @@
+Feature: Import files
+
+  Scenario: Move one path to another
+    Given the Server is running at "import-app"
+    When I go to "/static.html"
+    Then I should see 'Not Found'
+    When I go to "/static2.html"
+    Then I should see 'Static, no code!'
+
+  Scenario: Import all of bower
+    Given the Server is running at "import-app"
+    When I go to "/bower_components/jquery/dist/jquery.js"
+    Then I should see 'jQuery'
+    When I go to "/bower_components2/jquery/dist/jquery.js"
+    Then I should see 'jQuery'
+
+

data/features/javascript-testing.feature

@@ -0,0 +1,18 @@
+Feature: Test a site with javascript included
+
+  As a software developer
+  I want to develop a site using javascript
+  I would like to have a server step rendering javascript correctly in order to test it
+
+  @javascript
+  Scenario: Existing app with javascript
+    Given the Server is running at "javascript-app"
+    When I go to "/index.html"
+    Then I should see:
+    """
+    Local Hour
+    """
+    And I should see:
+    """
+    Local Minutes
+    """

data/features/markdown_redcarpet.feature

@@ -1,4 +1,3 @@
-@nojava
 Feature: Markdown (Redcarpet) support
   In order to test included Redcarpet support
 

data/features/markdown_redcarpet_in_haml.feature

@@ -1,4 +1,3 @@
-@nojava
 Feature: Markdown support in Haml
   In order to test support of the Haml markdown filter
 

data/features/minify_css.feature

@@ -5,16 +5,19 @@ Feature: Minify CSS
     Given a fixture app "minify-css-app"
     And a file named "config.rb" with:
       """
+      config[:sass_source_maps] = false
       """
     And the Server is running at "minify-css-app"
     When I go to "/stylesheets/site.css"
     Then I should see "7" lines
     And I should see "only screen and (device-width"
-    
+
   Scenario: Rendering external css with the feature enabled
     Given a fixture app "minify-css-app"
     And a file named "config.rb" with:
       """
+      config[:sass_source_maps] = false
+
       activate :minify_css
       """
     And the Server is running at "minify-css-app"
@@ -25,11 +28,27 @@ Feature: Minify CSS
     Then I should see "1" lines
     When I go to "/stylesheets/report.css"
     Then I should see "p{border:1px solid #ff6600}"
-    
+
+  Scenario: Rendering external css in a proxied resource
+    Given a fixture app "minify-css-app"
+    And a file named "config.rb" with:
+      """
+      config[:sass_source_maps] = false
+
+      activate :minify_css
+      proxy '/css-proxy', '/stylesheets/site.css', ignore: true
+      """
+    And the Server is running at "minify-css-app"
+    When I go to "/css-proxy"
+    Then I should see "1" lines
+    And I should see "only screen and (device-width"
+
   Scenario: Rendering external css with passthrough compressor
     Given a fixture app "passthrough-app"
     And a file named "config.rb" with:
       """
+      config[:sass_source_maps] = false
+
       module ::PassThrough
         def self.compress(data)
           data
@@ -46,6 +65,7 @@ Feature: Minify CSS
     Given a fixture app "minify-css-app"
     And a file named "config.rb" with:
       """
+      config[:sass_source_maps] = false
       """
     And the Server is running at "minify-css-app"
     When I go to "/inline-css.html"
@@ -58,11 +78,13 @@ Feature: Minify CSS
       }
     </style>
     """
-   
+
   Scenario: Rendering inline css with a passthrough minifier
     Given a fixture app "passthrough-app"
     And a file named "config.rb" with:
       """
+      config[:sass_source_maps] = false
+
       module ::PassThrough
         def self.compress(data)
           data
@@ -88,6 +110,8 @@ Feature: Minify CSS
     Given a fixture app "passthrough-app"
     And a file named "config.rb" with:
       """
+      config[:sass_source_maps] = false
+
       module ::HelloCompressor
         def self.compress(data)
           "Hello"
@@ -106,11 +130,13 @@ Feature: Minify CSS
       Hello
     </style>
     """
-    
+
   Scenario: Rendering inline css with the feature enabled
     Given a fixture app "minify-css-app"
     And a file named "config.rb" with:
       """
+      config[:sass_source_maps] = false
+
       activate :minify_css, inline: true
       """
     And the Server is running at "minify-css-app"
@@ -120,4 +146,60 @@ Feature: Minify CSS
     <style>
       body{test:style;good:deal}
     </style>
-    """
+    """
+
+  Scenario: Rendering inline css in a PHP document
+    Given a fixture app "minify-css-app"
+    And a file named "config.rb" with:
+      """
+      config[:sass_source_maps] = false
+
+      activate :minify_css, inline: true
+      """
+    And the Server is running at "minify-css-app"
+    When I go to "/inline-css.php"
+    Then I should see:
+    """
+    <?='Hello'?>
+
+    <style>
+      body{test:style;good:deal}
+    </style>
+    """
+
+  Scenario: Rendering inline css in a proxied resource
+    Given a fixture app "minify-css-app"
+    And a file named "config.rb" with:
+      """
+      config[:sass_source_maps] = false
+
+      activate :minify_css, inline: true
+      proxy '/inline-css-proxy', '/inline-css.html', ignore: true
+      """
+    And the Server is running at "minify-css-app"
+    When I go to "/inline-css-proxy"
+    Then I should see:
+    """
+    <style>
+      body{test:style;good:deal}
+    </style>
+    """
+
+  @preserve_mime_types
+  Scenario: Configuring content types of resources to be minified
+    Given a fixture app "minify-css-app"
+    And a file named "config.rb" with:
+      """
+      config[:sass_source_maps] = false
+
+      mime_type('.xcss', 'text/x-css')
+      activate :minify_css, content_types: ['text/x-css'],
+                            inline: true,
+                            inline_content_types: ['text/html']
+      """
+    And the Server is running at "minify-css-app"
+    When I go to "/stylesheets/site.xcss"
+    Then I should see "1" lines
+    And I should see "only screen and (device-width"
+    When I go to "/inline-css.php"
+    Then I should see "8" lines