I'm included content.-
-
- """
-
- Scenario: Linking to an image
- Given the Server is running at "asciidoc-app"
- When I go to "/gallery.html"
- Then I should see:
- """
-
-
+ Second Layout
+ <%= yield %>
+
+ """
+ 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
+ ---
+
+ Hi
+ """
+ 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 "Hi "
+ And I should see "Second Layout "
+
diff --git a/middleman-core/features/directory_index.feature b/middleman-core/features/directory_index.feature
index 1c8efb28..ddbd703f 100644
--- a/middleman-core/features/directory_index.feature
+++ b/middleman-core/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: Needs Index'
- Then I should see 'explicit_link_to: Explicit'
+ Then I should see 'explicit_link_to: Explicit'
Then I should see 'unknown_link_to: Unknown'
Then I should see 'relative_link_to: Relative'
Then I should see 'link_to_with_spaces: Spaces'
When I go to "/link_to/sub/"
Then I should see 'link_to: Needs Index'
- Then I should see 'explicit_link_to: Explicit'
+ Then I should see 'explicit_link_to: Explicit'
Then I should see 'unknown_link_to: Unknown'
Then I should see 'relative_link_to: Relative'
Then I should see 'link_to_with_spaces: Spaces'
-
diff --git a/middleman-core/features/dynamic_pages.feature b/middleman-core/features/dynamic_pages.feature
index 6d1b59ac..fc886ffd 100644
--- a/middleman-core/features/dynamic_pages.feature
+++ b/middleman-core/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"
\ No newline at end of file
+ Then I should see "File Not Found"
+ When I go to "/should_be_ignored9.html"
+ Then I should see "File Not Found"
diff --git a/middleman-core/features/encoding_option.feature b/middleman-core/features/encoding_option.feature
new file mode 100644
index 00000000..6244e420
--- /dev/null
+++ b/middleman-core/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 "äöü"
diff --git a/middleman-core/features/extension_api_deprecations.feature b/middleman-core/features/extension_api_deprecations.feature
new file mode 100644
index 00000000..8c9dd216
--- /dev/null
+++ b/middleman-core/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"
+
diff --git a/middleman-core/features/extension_hooks.feature b/middleman-core/features/extension_hooks.feature
new file mode 100644
index 00000000..1dedd9a9
--- /dev/null
+++ b/middleman-core/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 ///"
diff --git a/middleman-core/features/fonts.feature b/middleman-core/features/fonts.feature
deleted file mode 100644
index 7cc9f8a1..00000000
--- a/middleman-core/features/fonts.feature
+++ /dev/null
@@ -1,15 +0,0 @@
-Feature: Web Fonts
-
- Scenario: Checking built folder for content
- Given a successfully built app at "fonts-app"
- When I cd to "build"
- Then the following files should exist:
- | stylesheets/fonts.css |
- And the file "stylesheets/fonts.css" should contain "/fonts/StMarie-Thin.otf"
- And the file "stylesheets/fonts.css" should contain "/fonts/blank/blank.otf"
-
- Scenario: Rendering scss
- Given the Server is running at "fonts-app"
- When I go to "/stylesheets/fonts.css"
- Then I should see "/fonts/StMarie-Thin.otf"
- And I should see "/fonts/blank/blank.otf"
diff --git a/middleman-core/features/front-matter-neighbor.feature b/middleman-core/features/front-matter-neighbor.feature
index 67eb3d16..9260ff41 100644
--- a/middleman-core/features/front-matter-neighbor.feature
+++ b/middleman-core/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 "world ", :class => 'one' %>
- <% content_tag :where, :class => 'the hell is' do %>
+ <%= content_tag :div, "world ", class: 'one' %>
+ <% content_tag :where, class: 'the hell is' do %>
damn croissant
<% end %>
"""
diff --git a/middleman-core/features/helpers_form_tag.feature b/middleman-core/features/helpers_form_tag.feature
index 643ca18a..f1abaf5f 100644
--- a/middleman-core/features/helpers_form_tag.feature
+++ b/middleman-core/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"
diff --git a/middleman-core/features/helpers_link_to.feature b/middleman-core/features/helpers_link_to.feature
index d6caf6cf..fe8e8530 100644
--- a/middleman-core/features/helpers_link_to.feature
+++ b/middleman-core/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: Needs Index'
Then I should see 'relative: Relative'
+ Then I should see 'absolute spaces: Spaces Index'
+ Then I should see 'relative spaces: Spaces Relative'
When I go to "/link_to/sub.html"
Then I should see 'absolute: Needs Index'
Then I should see 'relative: Relative'
+ Then I should see 'absolute spaces: Spaces Index'
+ Then I should see 'relative spaces: Spaces Relative'
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: Needs Index'
Then I should see 'relative: Relative'
-
+
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/"
diff --git a/middleman-core/features/helpers_url_for.feature b/middleman-core/features/helpers_url_for.feature
index c2b5a5a8..840dcc9d 100644
--- a/middleman-core/features/helpers_url_for.feature
+++ b/middleman-core/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/"
diff --git a/middleman-core/features/i18n_builder.feature b/middleman-core/features/i18n_builder.feature
index 34a802b1..6129f250 100644
--- a/middleman-core/features/i18n_builder.feature
+++ b/middleman-core/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"
diff --git a/middleman-core/features/i18n_link_to.feature b/middleman-core/features/i18n_link_to.feature
index a10787c4..9d3f0682 100644
--- a/middleman-core/features/i18n_link_to.feature
+++ b/middleman-core/features/i18n_link_to.feature
@@ -4,7 +4,7 @@ Feature: i18n Paths
Given a fixture app "empty-app"
And a file named "data/pages.yml" with:
"""
- - hello.html
+ - hello.html
"""
And a file named "locales/en.yml" with:
"""
@@ -50,24 +50,24 @@ Feature: i18n Paths
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 Home'
- Then I should see 'Other Home'
- Then I should see 'Home: Current Block'
- Then I should see 'Home: Other Block'
- Then I should see 'Current hello.html'
- Then I should see 'Other hello.html'
- Then I should see 'Current Block'
- Then I should see 'Other Block'
+ Then I should see 'Current Home'
+ Then I should see 'Other Home'
+ Then I should see 'Home: Current Block'
+ Then I should see 'Home: Other Block'
+ Then I should see 'Current hello.html'
+ Then I should see 'Other hello.html'
+ Then I should see 'Current Block'
+ Then I should see 'Other Block'
When I go to "/es/hola.html"
Then I should see "Page: Hola"
- Then I should see 'Current Home'
- Then I should see 'Other Home'
- Then I should see 'Home: Current Block'
- Then I should see 'Home: Other Block'
- Then I should see 'Current hello.html'
- Then I should see 'Other hello.html'
- Then I should see 'Current Block'
- Then I should see 'Other Block'
+ Then I should see 'Current Home'
+ Then I should see 'Other Home'
+ Then I should see 'Home: Current Block'
+ Then I should see 'Home: Other Block'
+ Then I should see 'Current hello.html'
+ Then I should see 'Other hello.html'
+ Then I should see 'Current Block'
+ Then I should see 'Other Block'
Scenario: link_to is i18n aware and supports relative_links
Given a fixture app "empty-app"
@@ -124,30 +124,30 @@ Feature: i18n Paths
Then I should see "assets/css/main.css"
When I go to "/hello.html"
Then I should see "Page: Hello"
- Then I should see 'Current Home'
- Then I should see 'Other Home'
- Then I should see 'Home: Current Block'
- Then I should see 'Home: Other Block'
- Then I should see 'Current hello.html'
- Then I should see 'Other hello.html'
- Then I should see 'Current Block'
- Then I should see 'Other Block'
+ Then I should see 'Current Home'
+ Then I should see 'Other Home'
+ Then I should see 'Home: Current Block'
+ Then I should see 'Home: Other Block'
+ Then I should see 'Current hello.html'
+ Then I should see 'Other hello.html'
+ Then I should see 'Current Block'
+ Then I should see 'Other Block'
When I go to "/es/hola.html"
Then I should see "Page: Hola"
- Then I should see 'Current Home'
- Then I should see 'Other Home'
- Then I should see 'Home: Current Block'
- Then I should see 'Home: Other Block'
- Then I should see 'Current hello.html'
- Then I should see 'Other hello.html'
- Then I should see 'Current Block'
- Then I should see 'Other Block'
+ Then I should see 'Current Home'
+ Then I should see 'Other Home'
+ Then I should see 'Home: Current Block'
+ Then I should see 'Home: Other Block'
+ Then I should see 'Current hello.html'
+ Then I should see 'Other hello.html'
+ Then I should see 'Current Block'
+ Then I should see 'Other Block'
Scenario: url_for is i18n aware
Given a fixture app "empty-app"
And a file named "data/pages.yml" with:
"""
- - hello.html
+ - hello.html
- article.html
"""
And a file named "locales/en.yml" with:
diff --git a/middleman-core/features/i18n_mixed_sources.feature b/middleman-core/features/i18n_mixed_sources.feature
new file mode 100644
index 00000000..7ea92028
--- /dev/null
+++ b/middleman-core/features/i18n_mixed_sources.feature
@@ -0,0 +1,39 @@
+Feature: i18n merging path trees
+
+ Scenario: Mixing localized and non-localized sources and merging the path trees (see issue #1709)
+ Given a fixture app "i18n-test-app"
+ And a file named "config.rb" with:
+ """
+ activate :i18n, mount_at_root: :en, langs: [:en, :es]
+ """
+ Given the Server is running at "i18n-mixed-sources"
+
+ When I go to "/"
+ Then I should see "Current locale: en"
+ Then I should see "path: is-localized Home"
+ When I go to "/es"
+ Then I should see "Current locale: es"
+ Then I should see "path: is-localized Home"
+
+ When I go to "/a/"
+ Then I should see "Current locale: en"
+ Then I should see "path: is-localized Home # a/index.html.erb"
+ When I go to "/es/a/"
+ Then I should see "Current locale: es"
+ Then I should see "path: is-localized Home # a/index.html.erb"
+
+ When I go to "/b/"
+ Then I should see "Current locale: en"
+ Then I should see "path: is-localized Home # b/index.html.erb"
+
+ When I go to "/a/sub.html"
+ Then I should see "Current locale: en"
+ Then I should see "path: is-localized Home # a/index.html.erb # a/sub.html.erb"
+
+ When I go to "/b/sub.html"
+ Then I should see "Current locale: en"
+ Then I should see "path: is-localized Home # b/index.html.erb # b/sub.html.erb"
+
+ When I go to "/es/b/sub.html"
+ Then I should see "Current locale: es"
+ Then I should see "path: is-localized Home # b/index.html.erb # b/sub.html.erb"
diff --git a/middleman-core/features/i18n_preview.feature b/middleman-core/features/i18n_preview.feature
index 93c60dc1..4b96efcf 100644
--- a/middleman-core/features/i18n_preview.feature
+++ b/middleman-core/features/i18n_preview.feature
@@ -67,7 +67,7 @@ Feature: i18n Preview
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 the Server is running at "i18n-test-app"
When I go to "/"
@@ -86,7 +86,7 @@ Feature: i18n Preview
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 the Server is running at "i18n-alt-root-app"
When I go to "/"
@@ -104,7 +104,7 @@ Feature: i18n Preview
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 the Server is running at "i18n-test-app"
When I go to "/"
@@ -122,7 +122,7 @@ Feature: i18n Preview
Given a fixture app "i18n-test-app"
And a file named "config.rb" with:
"""
- activate :i18n, :mount_at_root => :es
+ activate :i18n, mount_at_root: :es
"""
Given the Server is running at "i18n-test-app"
When I go to "/en/index.html"
@@ -150,7 +150,7 @@ Feature: i18n Preview
Given a fixture app "i18n-test-app"
And a file named "config.rb" with:
"""
- activate :i18n, :langs => :es
+ activate :i18n, langs: :es
"""
Given the Server is running at "i18n-test-app"
When I go to "/en/index.html"
@@ -173,7 +173,7 @@ Feature: i18n Preview
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 the Server is running at "i18n-test-app"
When I go to "/en/index.html"
@@ -193,7 +193,7 @@ Feature: i18n Preview
Given a fixture app "i18n-test-app"
And a file named "config.rb" with:
"""
- activate :i18n, :langs => [:en]
+ activate :i18n, langs: [:en]
"""
Given the Server is running at "i18n-test-app"
When I go to "/"
@@ -228,7 +228,7 @@ Feature: i18n Preview
Given a fixture app "i18n-default-app"
And a file named "config.rb" with:
"""
- activate :i18n, :mount_at_root => :es
+ activate :i18n, mount_at_root: :es
"""
Given the Server is running at "i18n-default-app"
When I go to "/en/"
diff --git a/middleman-core/features/ignore.feature b/middleman-core/features/ignore.feature
index 166002c5..9e3d4688 100644
--- a/middleman-core/features/ignore.feature
+++ b/middleman-core/features/ignore.feature
@@ -12,7 +12,7 @@ Feature: Ignoring paths
And the following files should not exist:
| build/plain.html |
| build/about.html |
-
+
Scenario: Ignore a single path (server)
Given a fixture app "ignore-app"
And a file named "config.rb" with:
@@ -28,6 +28,35 @@ Feature: Ignoring paths
When I go to "/about.html"
Then I should see "File Not Found"
+ Scenario: Ignoring collected values
+ Given a fixture app "ignore-app"
+ And a file named "data/ignores.yaml" with:
+ """
+ ---
+ - "plain"
+ """
+ And a file named "config.rb" with:
+ """
+ data.ignores.each do |name|
+ ignore "#{name}.html"
+ end
+ """
+ And the Server is running
+ When I go to "/plain.html"
+ Then I should see "File Not Found"
+ When I go to "/about.html"
+ Then I should not see "File Not Found"
+
+ When the file "data/ignores.yaml" has the contents
+ """
+ ---
+ - "about"
+ """
+ When I go to "/plain.html"
+ Then I should not see "File Not Found"
+ When I go to "/about.html"
+ Then I should see "File Not Found"
+
Scenario: Ignore a globbed path (build)
Given a fixture app "ignore-app"
And a file named "config.rb" with:
@@ -47,7 +76,7 @@ Feature: Ignoring paths
| build/reports/index.html |
| build/reports/another.html |
| build/images/icons/messages.png |
-
+
Scenario: Ignore a globbed path (server)
Given a fixture app "ignore-app"
And a file named "config.rb" with:
@@ -93,7 +122,7 @@ Feature: Ignoring paths
| build/reports/index.html |
| build/reports/another.html |
| build/images/icons/messages.png |
-
+
Scenario: Ignore a regex (server)
Given a fixture app "ignore-app"
And a file named "config.rb" with:
@@ -118,4 +147,4 @@ Feature: Ignoring paths
When I go to "/reports/another.html"
Then I should see "File Not Found"
When I go to "/images/icons/messages.png"
- Then I should see "File Not Found"
\ No newline at end of file
+ Then I should see "File Not Found"
diff --git a/middleman-core/features/implied_extensions.feature b/middleman-core/features/implied_extensions.feature
deleted file mode 100644
index 63d4e5c4..00000000
--- a/middleman-core/features/implied_extensions.feature
+++ /dev/null
@@ -1,69 +0,0 @@
-Feature: Use default extensions when user doesn't supply them
-
- Scenario: Default extensions preview
- Given the Server is running at "implied-extensions-app"
- When I go to "/"
- Then I should see "hello: world"
- When I go to "/index.html"
- Then I should see "hello: world"
- When I go to "/index.erb"
- Then I should see "File Not Found"
- When I go to "/index"
- Then I should see "File Not Found"
-
- Scenario: Override erb extension
- Given a fixture app "implied-extensions-app"
- And a file named "config.rb" with:
- """
- template_extensions :erb => :htm
- """
- And the Server is running
- When I go to "/"
- Then I should see "File Not Found"
- When I go to "/index.htm"
- Then I should see "hello: world"
- When I go to "/index.erb"
- Then I should see "File Not Found"
- When I go to "/index"
- Then I should see "File Not Found"
- When I go to "/index.html"
- Then I should see "File Not Found"
-
- Scenario: Override erb extension
- Given a fixture app "implied-extensions-app"
- And a file named "config.rb" with:
- """
- set :index_file, "index.htm"
- template_extensions :erb => :htm
- """
- And the Server is running
- When I go to "/"
- Then I should see "hello: world"
- When I go to "/index.htm"
- Then I should see "hello: world"
-
- Scenario: Default extensions build
- Given a fixture app "implied-extensions-app"
- And a successfully built app at "implied-extensions-app"
- When I cd to "build"
- Then the following files should exist:
- | index.html |
- Then the following files should not exist:
- | index |
- | index.erb |
- And the file "index.html" should contain "hello: world"
-
- Scenario: Default extensions build with override
- Given a fixture app "implied-extensions-app"
- And a file named "config.rb" with:
- """
- template_extensions :erb => :htm
- """
- And a successfully built app at "implied-extensions-app"
- When I cd to "build"
- Then the following files should exist:
- | index.htm |
- Then the following files should not exist:
- | index |
- | index.erb |
- | index.html |
\ No newline at end of file
diff --git a/middleman-core/features/import_files.feature b/middleman-core/features/import_files.feature
new file mode 100644
index 00000000..faaf2039
--- /dev/null
+++ b/middleman-core/features/import_files.feature
@@ -0,0 +1,15 @@
+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'
diff --git a/middleman-core/features/instance_vars.feature b/middleman-core/features/instance_vars.feature
deleted file mode 100644
index ef240c57..00000000
--- a/middleman-core/features/instance_vars.feature
+++ /dev/null
@@ -1,9 +0,0 @@
-Feature: Instance Variables
- Scenario: A dynamic page template using instance variables
- Given the Server is running at "instance-vars-app"
- When I go to "/a.html"
- Then I should see "A: 'set'"
- Then I should see "B: ''"
- When I go to "/b.html"
- Then I should see "A: ''"
- Then I should see "B: 'set'"
diff --git a/middleman-core/features/markdown_kramdown.feature b/middleman-core/features/markdown_kramdown.feature
index 3f64a44c..667aa58f 100644
--- a/middleman-core/features/markdown_kramdown.feature
+++ b/middleman-core/features/markdown_kramdown.feature
@@ -6,7 +6,7 @@ Feature: Markdown (Kramdown) support
And a file named "config.rb" with:
"""
set :markdown_engine, :kramdown
- set :markdown, :smartypants => true
+ set :markdown, smartypants: true
"""
Given the Server is running at "markdown-app"
When I go to "/smarty_pants.html"
diff --git a/middleman-core/features/markdown_kramdown_in_slim.feature b/middleman-core/features/markdown_kramdown_in_slim.feature
new file mode 100644
index 00000000..9e58a461
--- /dev/null
+++ b/middleman-core/features/markdown_kramdown_in_slim.feature
@@ -0,0 +1,42 @@
+Feature: Markdown support in Slim (Kramdown)
+ In order to test support of the Slim markdown filter
+
+ Scenario: Markdown filter in Slim works (with Kramdown)
+ Given a fixture app "markdown-in-slim-app"
+ And a file named "config.rb" with:
+ """
+ set :markdown_engine, :kramdown
+ activate :directory_indexes
+ """
+ And a file named "source/markdown_filter.html.slim" with:
+ """
+ markdown:
+ # H1
+
+ paragraph
+ """
+ Given the Server is running at "markdown-in-slim-app"
+ When I go to "/markdown_filter/"
+ Then I should see ">H1"
+ Then I should see "
'
+ Then I should see ''
\ No newline at end of file
+ Then I should see '
'
+
+ Scenario: URLs are not rewritten for rewrite ignored paths
+ Given a fixture app "relative-assets-app"
+ And a file named "config.rb" with:
+ """
+ activate :relative_assets, rewrite_ignore: [
+ '/stylesheets/fonts.css',
+ ]
+ """
+ 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'
+ When I go to "/stylesheets/fonts.css"
+ Then I should see 'url(/fonts/roboto/roboto-regular-webfont.eot'
diff --git a/middleman-core/features/relative_assets_helpers_only.feature b/middleman-core/features/relative_assets_helpers_only.feature
new file mode 100644
index 00000000..194c8b37
--- /dev/null
+++ b/middleman-core/features/relative_assets_helpers_only.feature
@@ -0,0 +1,123 @@
+Feature: Relative Assets (Helpers Only)
+
+ Scenario: Rendering css with the feature enabled
+ Given a fixture app "relative-assets-app"
+ And a file named "config.rb" with:
+ """
+ activate :relative_assets, helpers_only: true
+ """
+ And a file named "source/stylesheets/relative_assets.css.sass.erb" with:
+ """
+ h1
+ background: url("<%= asset_url('images/blank.gif') %>")
+ h2
+ background: url("<%= asset_url('/images/blank2.gif') %>")
+ """
+ And a file named "source/javascripts/application.js.erb" with:
+ """
+ function foo() {
+ var img = document.createElement('img');
+ img.src = '<%= asset_url("images/100px.jpg") %>';
+ var body = document.getElementsByTagName('body')[0];
+ body.insertBefore(img, body.firstChild);
+ }
+
+ window.onload = foo;
+ """
+ And a file named "source/stylesheets/fonts3.css.erb" with:
+ """
+ @font-face {
+ font-family: 'Roboto2';
+ src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot") %>);
+ src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot?#iefix") %>) format('embedded-opentype'),
+ url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.woff") %>) format('woff'),
+ url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.ttf") %>) format('truetype'),
+ url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.svg#robotoregular") %>) format('svg');
+ font-weight: normal;
+ font-style: normal;
+ }
+ """
+ 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'
+ And I should see 'url("../images/blank2.gif'
+ When I go to "/javascripts/application.js"
+ Then I should not see "../"
+ When I go to "/stylesheets/fonts3.css"
+ Then I should see 'url(../fonts/roboto/roboto-regular-webfont.eot'
+ And I should see 'url(../fonts/roboto/roboto-regular-webfont.woff'
+ And I should see 'url(../fonts/roboto/roboto-regular-webfont.ttf'
+ And I should see 'url(../fonts/roboto/roboto-regular-webfont.svg'
+
+ Scenario: Relative css reference with directory indexes
+ Given a fixture app "relative-assets-app"
+ And a file named "config.rb" with:
+ """
+ activate :directory_indexes
+ activate :relative_assets, helpers_only: true
+ """
+ And the Server is running at "relative-assets-app"
+ When I go to "/relative_image/index.html"
+ Then I should see "../stylesheets/relative_assets.css"
+
+ Scenario: Relative assets via image_tag
+ Given a fixture app "relative-assets-app"
+ And a file named "config.rb" with:
+ """
+ activate :relative_assets, helpers_only: true
+ """
+ And a file named "source/sub/image_tag.html.erb" with:
+ """
+ <%= image_tag '/img/blank.gif' %>
+ """
+ And the Server is running at "relative-assets-app"
+ When I go to "/sub/image_tag.html"
+ Then I should see '
+ """
+ And the Server is running at "relative-assets-app"
+ When I go to "/sub/image_tag.html"
+ Then I should see ''
+
+ Scenario: URLs are not rewritten for rewrite ignored paths
+ Given a fixture app "relative-assets-app"
+ And a file named "config.rb" with:
+ """
+ activate :relative_assets, rewrite_ignore: [
+ '/stylesheets/fonts3.css',
+ ], helpers_only: true
+ """
+ And a file named "source/stylesheets/relative_assets.css.sass.erb" with:
+ """
+ h1
+ background: url("<%= asset_url('images/blank.gif') %>")
+ h2
+ background: url("<%= asset_url('/images/blank2.gif') %>")
+ """
+ And a file named "source/stylesheets/fonts3.css.erb" with:
+ """
+ @font-face {
+ font-family: 'Roboto2';
+ src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot") %>);
+ src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot?#iefix") %>) format('embedded-opentype'),
+ url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.woff") %>) format('woff'),
+ url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.ttf") %>) format('truetype'),
+ url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.svg#robotoregular") %>) format('svg');
+ font-weight: normal;
+ font-style: normal;
+ }
+ """
+ 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'
+ When I go to "/stylesheets/fonts3.css"
+ Then I should see 'url(/fonts/roboto/roboto-regular-webfont.eot'
diff --git a/middleman-core/features/request_params.feature b/middleman-core/features/request_params.feature
deleted file mode 100644
index 968d0bfc..00000000
--- a/middleman-core/features/request_params.feature
+++ /dev/null
@@ -1,6 +0,0 @@
-Feature: Support request parameters
- Scenario: Use request params in a template
- Given the Server is running at "request-app"
- When I go to "/index.html?say=Hello+World"
- Then I should see "Quote Hello World"
- Then I should see "Symbol Hello World"
diff --git a/middleman-core/features/sass_in_slim.feature b/middleman-core/features/sass_in_slim.feature
new file mode 100644
index 00000000..d04055e4
--- /dev/null
+++ b/middleman-core/features/sass_in_slim.feature
@@ -0,0 +1,40 @@
+Feature: Sass/SCSS support in Slim
+ In order to test support of the Slim sass and scss filters
+
+ Scenario: Sass filter in Slim works
+ Given a fixture app "sass-in-slim-app"
+ And a file named "config.rb" with:
+ """
+ activate :directory_indexes
+ """
+ And a file named "source/sass_filter.html.slim" with:
+ """
+ sass:
+ .sass
+ margin: 0
+ """
+ Given the Server is running at "sass-in-slim-app"
+ When I go to "/sass_filter/"
+ Then I should see "text/css"
+ Then I should see ".sass"
+ Then I should see "margin:0"
+
+
+ Scenario: SCSS filter in Slim works
+ Given a fixture app "sass-in-slim-app"
+ And a file named "config.rb" with:
+ """
+ activate :directory_indexes
+ """
+ And a file named "source/scss_filter.html.slim" with:
+ """
+ scss:
+ .scss {
+ margin: 0;
+ }
+ """
+ Given the Server is running at "sass-in-slim-app"
+ When I go to "/scss_filter/"
+ Then I should see "text/css"
+ Then I should see ".scss"
+ Then I should see "margin:0"
diff --git a/middleman-core/features/slim.feature b/middleman-core/features/slim.feature
index 187600a1..031120f3 100644
--- a/middleman-core/features/slim.feature
+++ b/middleman-core/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"
\ No newline at end of file
+ Then I should see "Error:"
diff --git a/middleman-core/features/static_server.feature b/middleman-core/features/static_server.feature
deleted file mode 100644
index 569b4cd1..00000000
--- a/middleman-core/features/static_server.feature
+++ /dev/null
@@ -1,6 +0,0 @@
-Feature: Middleman should serve plain directories without config
-
- Scenario: Preview a folder of static pages
- Given the Server is running at "plain-app"
- When I go to "/index.html"
- Then I should see "I am index"
\ No newline at end of file
diff --git a/middleman-core/features/step_definitions/page_layout_steps.rb b/middleman-core/features/step_definitions/page_layout_steps.rb
deleted file mode 100644
index 9456d4cf..00000000
--- a/middleman-core/features/step_definitions/page_layout_steps.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-Given /^page "([^\"]*)" has layout "([^\"]*)"$/ do |url, layout|
- @initialize_commands ||= []
- @initialize_commands << lambda {
- page(url, :layout => layout.to_sym)
- }
-end
-
-Given /^"([^\"]*)" with_layout block has layout "([^\"]*)"$/ do |url, layout|
- @initialize_commands ||= []
- @initialize_commands << lambda {
- with_layout(layout.to_sym) do
- page(url)
- end
- }
-end
diff --git a/middleman-core/features/step_definitions/queryable_steps.rb b/middleman-core/features/step_definitions/queryable_steps.rb
deleted file mode 100644
index 995c3d33..00000000
--- a/middleman-core/features/step_definitions/queryable_steps.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-Given /^a simple 'where' query$/ do
- @query = Middleman::Sitemap::Queryable::Query.new({}).where(:foo => 'bar')
-end
-
-When /^I chain a where clause onto that query$/ do
- @new_query = @query.where(:baz => 'foo')
-end
-
-Then /^the original query should remain unchanged$/ do
- @query.opts({}).should_not eql @new_query.opts({})
-end
-
-Then /^should initialize with an attribute and an operator$/ do
- selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :author, :operator => 'equal'
- :author.should == selector.attribute
- 'equal'.should == selector.operator
-end
-
-Then /^should raise an exception if the operator is not supported$/ do
- expect {
- selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :author, :operator => 'zomg'
- }.to raise_error(::Middleman::Sitemap::Queryable::OperatorNotSupportedError)
-end
-
-Then /^should limit the documents to the number specified$/ do
- @server_inst.sitemap.order_by(:id).limit(2).all.map { |r| r.raw_data[:id] }.sort.should == [1,2].sort
-end
-
-Then /^should offset the documents by the number specified$/ do
- @server_inst.sitemap.order_by(:id).offset(2).all.map { |r| r.raw_data[:id] }.sort.should == [3,4,5].sort
-end
-
-Then /^should support offset and limit at the same time$/ do
- @server_inst.sitemap.order_by(:id).offset(1).limit(2).all.map { |r| r.raw_data[:id] }.sort.should == [2,3].sort
-end
-
-Then /^should not freak out about an offset higher than the document count$/ do
- @server_inst.sitemap.order_by(:id).offset(5).all.should == []
-end
-
-Then /^should return the right documents$/ do
- documents = @server_inst.sitemap.resources.select { |r| !r.raw_data.empty? }
- document_1 = documents[0]
- document_2 = documents[1]
-
- found_document = @server_inst.sitemap.where(:title => document_1.raw_data[:title]).first
- document_1.should == found_document
-
- found_document = @server_inst.sitemap.where(:title => document_2.raw_data[:title]).first
- document_2.should == found_document
-end
-
-Then /^should be chainable$/ do
- documents = @server_inst.sitemap.resources.select { |r| !r.raw_data.empty? }
- document_1 = documents[0]
-
- document_proxy = @server_inst.sitemap.where(:title => document_1.raw_data[:title])
- document_proxy.where(:id => document_1.raw_data[:id])
- document_1.should == document_proxy.first
-end
-
-Then /^should not be confused by attributes not present in all documents$/ do
- result = @server_inst.sitemap.where(:seldom_attribute => 'is seldom').all
- result.map { |r| r.raw_data[:id] }.should == [4]
-end
-
-Then /^with a gt operator should return the right documents$/ do
- selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'gt'
- found_documents = @server_inst.sitemap.where(selector => 2).all
- found_documents.map { |r| r.raw_data[:id] }.sort.should == [5,3,4].sort
-end
-
-Then /^with a gte operator should return the right documents$/ do
- selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'gte'
- found_documents = @server_inst.sitemap.where(selector => 2).all
- found_documents.map { |r| r.raw_data[:id] }.sort.should == [2,5,3,4].sort
-end
-
-Then /^with an in operator should return the right documents$/ do
- selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'in'
- found_documents = @server_inst.sitemap.where(selector => [2,3]).all
- found_documents.map { |r| r.raw_data[:id] }.sort.should == [2,3].sort
-end
-
-Then /^with an lt operator should return the right documents$/ do
- selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'lt'
- found_documents = @server_inst.sitemap.where(selector => 2).all
- found_documents.map { |r| r.raw_data[:id] }.should == [1]
-end
-
-Then /^with an lte operator should return the right documents$/ do
- selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'lte'
- found_documents = @server_inst.sitemap.where(selector => 2).all
- found_documents.map { |r| r.raw_data[:id] }.sort.should == [1,2].sort
-end
-
-Then /^with an include operator include should return the right documents$/ do
- selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :tags, :operator => 'include'
- found_documents = @server_inst.sitemap.where(selector => 'ruby').all
- found_documents.map { |r| r.raw_data[:id] }.sort.should == [1,2].sort
-end
-
-Then /^with mixed operators should return the right documents$/ do
- in_selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'in'
- gt_selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'gt'
- documents_proxy = @server_inst.sitemap.where(in_selector => [2,3])
- found_documents = documents_proxy.where(gt_selector => 2).all
- found_documents.map { |r| r.raw_data[:id] }.should == [3]
-end
-
-Then /^using multiple constrains in one where should return the right documents$/ do
- selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'lte'
- found_documents = @server_inst.sitemap.where(selector => 2, :status => :published).all
- found_documents.map { |r| r.raw_data[:id] }.sort.should == [1,2].sort
-end
-
-Then /^should support ordering by attribute ascending$/ do
- found_documents = @server_inst.sitemap.order_by(:title => :asc).all
- found_documents.map { |r| r.raw_data[:id] }.should == [2,3,1,5,4]
-end
-
-Then /^should support ordering by attribute descending$/ do
- found_documents = @server_inst.sitemap.order_by(:title => :desc).all
- found_documents.map { |r| r.raw_data[:id] }.should == [4,5,1,3,2]
-end
-
-Then /^should order by attribute ascending by default$/ do
- found_documents = @server_inst.sitemap.order_by(:title).all
- found_documents.map { |r| r.raw_data[:id] }.should == [2,3,1,5,4]
-end
-
-Then /^should exclude documents that do not own the attribute$/ do
- found_documents = @server_inst.sitemap.order_by(:status).all
- found_documents.map { |r| r.raw_data[:id] }.to_set.should == [1,2].to_set
-end
diff --git a/middleman-core/features/stylus.feature b/middleman-core/features/stylus.feature
index df17962b..15b44f18 100644
--- a/middleman-core/features/stylus.feature
+++ b/middleman-core/features/stylus.feature
@@ -1,4 +1,3 @@
-@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"
diff --git a/middleman-core/features/support/env.rb b/middleman-core/features/support/env.rb
index 8213b7c7..77cfbb06 100644
--- a/middleman-core/features/support/env.rb
+++ b/middleman-core/features/support/env.rb
@@ -1,15 +1,19 @@
ENV["TEST"] = "true"
-ENV["AUTOLOAD_SPROCKETS"] = "false"
+
+require 'sassc'
require 'simplecov'
SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..'))
-require 'capybara/poltergeist'
+require 'phantomjs/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')
diff --git a/middleman-core/features/template-key-collision.feature b/middleman-core/features/template-key-collision.feature
new file mode 100644
index 00000000..9e530dc1
--- /dev/null
+++ b/middleman-core/features/template-key-collision.feature
@@ -0,0 +1,26 @@
+Feature: Don't allow template locals to overwrite template helpers
+
+ Scenario: Normal Template
+ Given an empty app
+ And a file named "config.rb" with:
+ """
+ class TestExt < ::Middleman::Extension
+ expose_to_template foo: :foo
+
+ def foo
+ "bar"
+ end
+ end
+
+ ::Middleman::Extensions.register :test, TestExt
+
+ activate :test
+
+ page "/index.html", locals: { foo: false }
+ """
+ And a file named "source/index.html.erb" with:
+ """
+ <%= foo %>
+ """
+ Given a built app at "empty_app"
+ Then the exit status should be 1
diff --git a/middleman-core/features/twitter-bootstrap-compile.feature b/middleman-core/features/twitter-bootstrap-compile.feature
deleted file mode 100644
index 04ffc0ce..00000000
--- a/middleman-core/features/twitter-bootstrap-compile.feature
+++ /dev/null
@@ -1,6 +0,0 @@
-@nojava @nowindows
-Feature: Compile a complicated Twitter bootstrap app
-
- Scenario: User drops Twitter Bootstrap source into an app
-
- Given a successfully built app at "twitter-bootstrap-app"
diff --git a/middleman-core/features/v3_extensions.feature b/middleman-core/features/v3_extensions.feature
deleted file mode 100644
index 134dd72f..00000000
--- a/middleman-core/features/v3_extensions.feature
+++ /dev/null
@@ -1,20 +0,0 @@
-Feature: v3 Modular Extension
- Scenario: Registering and overwriting a system config option
- Given a fixture app "large-build-app"
- And a file named "config.rb" with:
- """
- module MyFeature
- class << self
- def registered(app)
- app.set :css_dir, "lib/my/css"
- end
- alias :included :registered
- end
- end
-
- ::Middleman::Extensions.register(:my_feature, MyFeature)
- activate :my_feature
- """
- Given a successfully built app at "large-build-app"
- When I cd to "build"
- Then the file "link_test.html" should contain "lib/my/css/test.css"
\ No newline at end of file
diff --git a/middleman-core/features/working_directory.feature b/middleman-core/features/working_directory.feature
deleted file mode 100644
index 9532e68f..00000000
--- a/middleman-core/features/working_directory.feature
+++ /dev/null
@@ -1,33 +0,0 @@
-Feature: Honour working directory
- Honour the working directory during testing
- In order to support helpers which work with the current directories
-
- Scenario: Set working directory for helpers in tests
- Given a fixture app "empty-app"
- And a file named "source/index.erb" with:
- """
- <%= Dir.getwd %>
- """
- And the Server is running
- When I go to "/index.html"
- Then I should see:
- """
- aruba
- """
-
- Scenario: Set working directory for config.rb in tests
- Given a fixture app "empty-app"
- And a file named "config.rb" with:
- """
- set :my_working_directory, Dir.getwd
- """
- And a file named "source/index.erb" with:
- """
- <%= my_working_directory %>
- """
- And the Server is running
- When I go to "/index.html"
- Then I should see:
- """
- aruba
- """
diff --git a/middleman-core/fixtures/asciidoc-app/source/_include.adoc b/middleman-core/fixtures/asciidoc-app/source/_include.adoc
deleted file mode 100644
index b0cdec38..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/_include.adoc
+++ /dev/null
@@ -1 +0,0 @@
-I'm included content.
diff --git a/middleman-core/fixtures/asciidoc-app/source/code.adoc b/middleman-core/fixtures/asciidoc-app/source/code.adoc
deleted file mode 100644
index e0d6a519..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/code.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-```ruby
-puts "Is this mic on?"
-```
diff --git a/middleman-core/fixtures/asciidoc-app/source/custom-attribute.adoc b/middleman-core/fixtures/asciidoc-app/source/custom-attribute.adoc
deleted file mode 100644
index b4eb729d..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/custom-attribute.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-++++
-{foo}
-++++
diff --git a/middleman-core/fixtures/asciidoc-app/source/gallery.adoc b/middleman-core/fixtures/asciidoc-app/source/gallery.adoc
deleted file mode 100644
index 4a9f37f1..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/gallery.adoc
+++ /dev/null
@@ -1 +0,0 @@
-image::tiger.gif[]
diff --git a/middleman-core/fixtures/asciidoc-app/source/hello-no-layout.adoc b/middleman-core/fixtures/asciidoc-app/source/hello-no-layout.adoc
deleted file mode 100644
index 8156a16f..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/hello-no-layout.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-:page-layout: false
-Hello, AsciiDoc!
diff --git a/middleman-core/fixtures/asciidoc-app/source/hello-with-front-matter.adoc b/middleman-core/fixtures/asciidoc-app/source/hello-with-front-matter.adoc
deleted file mode 100644
index 5e1f91a3..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/hello-with-front-matter.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Page Title
-layout: default
----
-Hello, AsciiDoc!
diff --git a/middleman-core/fixtures/asciidoc-app/source/hello-with-layout.adoc b/middleman-core/fixtures/asciidoc-app/source/hello-with-layout.adoc
deleted file mode 100644
index 763ba8c1..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/hello-with-layout.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-:page-layout: default
-Hello, AsciiDoc!
diff --git a/middleman-core/fixtures/asciidoc-app/source/hello-with-title.adoc b/middleman-core/fixtures/asciidoc-app/source/hello-with-title.adoc
deleted file mode 100644
index e2c7673b..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/hello-with-title.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-= Page Title
-:page-layout: default
-
-Hello, AsciiDoc!
diff --git a/middleman-core/fixtures/asciidoc-app/source/hello.adoc b/middleman-core/fixtures/asciidoc-app/source/hello.adoc
deleted file mode 100755
index 6c1ab072..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/hello.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-Hello, AsciiDoc!
-ifdef::env-middleman[]
-Middleman, I am in you.
-endif::env-middleman[]
diff --git a/middleman-core/fixtures/asciidoc-app/source/layouts/default.erb b/middleman-core/fixtures/asciidoc-app/source/layouts/default.erb
deleted file mode 100644
index 6ae4c924..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/layouts/default.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-<%= data.page.title || 'Fallback' %>
-
-
-<%= yield %>
-
-
diff --git a/middleman-core/fixtures/asciidoc-app/source/master.adoc b/middleman-core/fixtures/asciidoc-app/source/master.adoc
deleted file mode 100644
index 1b789b44..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/master.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-....
-include::_include.adoc[]
-....
diff --git a/middleman-core/fixtures/asset-hash-app/config.rb b/middleman-core/fixtures/asset-hash-app/config.rb
index cee0d36f..1327d8f0 100644
--- a/middleman-core/fixtures/asset-hash-app/config.rb
+++ b/middleman-core/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
diff --git a/middleman-core/fixtures/asset-hash-app/source/index.html.erb b/middleman-core/fixtures/asset-hash-app/source/index.html.erb
index 59a9c54f..de017654 100644
--- a/middleman-core/fixtures/asset-hash-app/source/index.html.erb
+++ b/middleman-core/fixtures/asset-hash-app/source/index.html.erb
@@ -4,6 +4,9 @@
 %>)
+<%= image_tag('100px.jpg?test') %>
+<%= image_tag('100px.jpg?#test') %>
+<%= image_tag('100px.jpg#test') %>
- 
-
- """
-
- Scenario: Configuring custom AsciiDoc attributes
- Given a fixture app "asciidoc-app"
- And a file named "config.rb" with:
- """
- set :asciidoc_attributes, %w(foo=bar)
- """
- Given the Server is running at "asciidoc-app"
- When I go to "/custom-attribute.html"
- Then I should see "bar"
-
- Scenario: Highlighting source code
- Given a fixture app "asciidoc-app"
- And a file named "config.rb" with:
- """
- set :asciidoc_attributes, %w(source-highlighter=html-pipeline)
- """
- Given the Server is running at "asciidoc-app"
- When I go to "/code.html"
- Then I should see:
- """
-
-
-
- """
diff --git a/middleman-core/features/asset_hash.feature b/middleman-core/features/asset_hash.feature
index a4f3ec01..7c173800 100644
--- a/middleman-core/features/asset_hash.feature
+++ b/middleman-core/features/asset_hash.feature
@@ -1,4 +1,4 @@
-Feature: Assets get a file hash appended to their and references to them are updated
+Feature: Assets get file hashes appended to them and references to them are updated
Scenario: Hashed-asset files are produced, and HTML, CSS, JSON and JavaScript gets rewritten to reference the new files
Given a successfully built app at "asset-hash-app"
When I cd to "build"
@@ -12,7 +12,7 @@ Feature: Assets get a file hash appended to their and references to them are upd
| images/300px-59adce76.jpg |
| images/100px-5fd6fb90.gif |
| javascripts/application-1d8d5276.js |
- | stylesheets/site-50eaa978.css |
+ | stylesheets/site-8bc55985.css |
| index.html |
| subdir/index.html |
| other/index.html |
@@ -26,18 +26,21 @@ Feature: Assets get a file hash appended to their and references to them are upd
| stylesheets/site.css |
And the file "javascripts/application-1d8d5276.js" should contain "img.src = '/images/100px-5fd6fb90.jpg'"
- And the file "stylesheets/site-50eaa978.css" should contain "background-image: url('../images/100px-5fd6fb90.jpg')"
+ And the file "stylesheets/site-8bc55985.css" should contain:
+ """
+ background-image: url("../images/100px-5fd6fb90.jpg")
+ """
And the file "index.html" should contain 'href="apple-touch-icon.png"'
- And the file "index.html" should contain 'href="stylesheets/site-50eaa978.css"'
+ And the file "index.html" should contain 'href="stylesheets/site-8bc55985.css"'
And the file "index.html" should contain 'src="javascripts/application-1d8d5276.js"'
And the file "index.html" should contain 'src="images/100px-5fd6fb90.jpg"'
+ And the file "subdir/index.html" should contain 'href="../stylesheets/site-8bc55985.css"'
And the file "index.html" should contain 'srcset="images/100px-5fd6fb90.jpg 1x, images/200px-c11eb203.jpg 2x, images/300px-59adce76.jpg 3x"'
And the file "index.html" should contain 'src="images/100px-5fd6fb90.gif"'
And the file "index.html" should contain 'src="images/100px-1242c368.png"'
- And the file "subdir/index.html" should contain 'href="../stylesheets/site-50eaa978.css"'
And the file "subdir/index.html" should contain 'src="../javascripts/application-1d8d5276.js"'
And the file "subdir/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
- And the file "other/index.html" should contain 'href="../stylesheets/site-50eaa978.css"'
+ And the file "other/index.html" should contain 'href="../stylesheets/site-8bc55985.css"'
And the file "other/index.html" should contain 'src="../javascripts/application-1d8d5276.js"'
And the file "other/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
And the file "api.json" should contain 'images/100px-5fd6fb90.gif'
@@ -60,22 +63,29 @@ Feature: Assets get a file hash appended to their and references to them are upd
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-50eaa978.css"'
+ And I should see 'href="stylesheets/site-d1a750ca.css"'
+ And I should see 'href="stylesheets/fragment-99b76247.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"'
+ And I should see 'src="images/100px-5fd6fb90.jpg?test"'
+ And I should see 'src="images/100px-5fd6fb90.jpg?#test"'
+ And I should see 'src="images/100px-5fd6fb90.jpg#test"'
When I go to "/subdir/"
- Then I should see 'href="../stylesheets/site-50eaa978.css"'
+ Then I should see 'href="../stylesheets/site-d1a750ca.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-50eaa978.css"'
+ Then I should see 'href="../stylesheets/site-d1a750ca.css"'
And I should see 'src="../javascripts/application-1d8d5276.js"'
And I should see 'src="../images/100px-5fd6fb90.jpg"'
+ And I should see 'src="../images/100px-5fd6fb90.jpg?test"'
+ And I should see 'src="../images/100px-5fd6fb90.jpg?#test"'
+ And I should see 'src="../images/100px-5fd6fb90.jpg#test"'
When I go to "/javascripts/application-1d8d5276.js"
Then I should see "img.src = '/images/100px-5fd6fb90.jpg'"
- When I go to "/stylesheets/site-50eaa978.css"
- Then I should see "background-image: url('../images/100px-5fd6fb90.jpg')"
+ When I go to "/stylesheets/site-d1a750ca.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'
And I should see 'images/100px-5fd6fb90.jpg'
@@ -84,6 +94,11 @@ Feature: Assets get a file hash appended to their and references to them are upd
Then I should see 'images/100px-5fd6fb90.gif'
And I should see 'images/100px-5fd6fb90.jpg'
And I should see 'images/100px-1242c368.png'
+ When I go to "/stylesheets/fragment-99b76247.css"
+ And I should see 'url("../images/100px-5fd6fb90.jpg");'
+ And I should see 'url("../images/100px-5fd6fb90.jpg?test");'
+ And I should see 'url("../images/100px-5fd6fb90.jpg?#test");'
+ And I should see 'url("../images/100px-5fd6fb90.jpg#test");'
Scenario: Hashed assets work with Slim
Given the Server is running at "asset-hash-app"
@@ -92,20 +107,69 @@ Feature: Assets get a file hash appended to their and references to them are upd
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"'
- Scenario: Enabling an asset host still produces hashed files and references
+ Scenario: Enabling an asset host still produces hashed files and references (hash first)
+ Given a fixture app "asset-hash-host-app"
+ And a file named "config.rb" with:
+ """
+ set :sass_source_maps, false
+ activate :asset_hash
+ activate :directory_indexes
+ activate :asset_host, host: 'http://middlemanapp.com'
+ """
Given the Server is running at "asset-hash-host-app"
When I go to "/"
- Then I should see 'href="http://middlemanapp.com/stylesheets/site-54baaf3a.css"'
+ Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
+ Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-2902933e.css"'
And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
+ And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
+ And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
+ And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
When I go to "/subdir/"
- Then I should see 'href="http://middlemanapp.com/stylesheets/site-54baaf3a.css"'
+ Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.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-54baaf3a.css"'
+ Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
- # Asset helpers don't appear to work from Compass right now
- # When I go to "/stylesheets/site-e5a31a3e.css"
- # Then I should see "background-image: url('http://middlemanapp.com/images/100px-5fd6fb90.jpg')"
+ And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
+ And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
+ And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
+ When I go to "/stylesheets/fragment-2902933e.css"
+ And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg");'
+ And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?test");'
+ And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test");'
+ And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg#test");'
+
+ Scenario: Enabling an asset host still produces hashed files and references (host first)
+ Given a fixture app "asset-hash-host-app"
+ And a file named "config.rb" with:
+ """
+ set :sass_source_maps, false
+ activate :asset_host, host: 'http://middlemanapp.com'
+ activate :directory_indexes
+ activate :asset_hash
+ """
+ Given the Server is running at "asset-hash-host-app"
+ When I go to "/"
+ Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
+ Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-2902933e.css"'
+ And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
+ And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
+ And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
+ And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
+ When I go to "/subdir/"
+ Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.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-7474cadd.css"'
+ And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
+ And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
+ And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
+ And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
+ When I go to "/stylesheets/fragment-2902933e.css"
+ And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg")'
+ And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?test")'
+ And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test")'
+ And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg#test")'
Scenario: The asset hash should change when a SASS partial changes
Given the Server is running at "asset-hash-app"
@@ -115,14 +179,14 @@ Feature: Assets get a file hash appended to their and references to them are upd
font-size: 14px
"""
When I go to "/partials/"
- Then I should see 'href="../stylesheets/uses_partials-423a00f7.css'
+ Then I should see 'href="../stylesheets/uses_partials-4d4e34e6.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-e8c3d4eb.css'
+ Then I should see 'href="../stylesheets/uses_partials-ec347271.css'
Scenario: The asset hash should change when a Rack-based filter changes
Given a fixture app "asset-hash-app"
@@ -132,22 +196,25 @@ Feature: Assets get a file hash appended to their and references to them are upd
activate :relative_assets
activate :directory_indexes
require 'lib/middleware.rb'
- use Middleware
+ use ::Middleware
"""
Given the Server is running at "asset-hash-app"
When I go to "/"
- Then I should see 'href="stylesheets/site-5770af52.css'
- When I go to "stylesheets/site-5770af52.css"
- Then I should see 'background-image'
+ Then I should see 'href="stylesheets/site-5ad7def0.css'
+ When I go to "stylesheets/site-5ad7def0.css"
+ Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg")'
Then I should see 'Added by Rack filter'
- When I go to "stylesheets/site-50eaa978.css"
- Then I should see 'Not Found'
Scenario: Hashed-asset files are not produced for ignored paths
Given a fixture app "asset-hash-app"
And a file named "config.rb" with:
"""
- activate :asset_hash, :ignore => [%r(javascripts/*), 'images/*']
+ is_stylesheet = proc { |path| path.start_with? 'stylesheets' }
+ activate :asset_hash, ignore: [
+ %r(javascripts/*),
+ 'images/*',
+ is_stylesheet
+ ]
activate :relative_assets
activate :directory_indexes
"""
@@ -161,7 +228,7 @@ Feature: Assets get a file hash appended to their and references to them are upd
| images/100px.jpg |
| images/100px.gif |
| javascripts/application.js |
- | stylesheets/site-50eaa978.css |
+ | stylesheets/site.css |
| index.html |
| subdir/index.html |
| other/index.html |
@@ -172,18 +239,86 @@ Feature: Assets get a file hash appended to their and references to them are upd
| images/100px-5fd6fb90.jpg |
| images/100px-5fd6fb90.gif |
| javascripts/application-1d8d5276.js |
+ | stylesheets/site-7474cadd.css |
+
+ Scenario: Hashed-asset files are not replaced for rewrite ignored paths
+ Given a fixture app "asset-hash-app"
+ And a file named "config.rb" with:
+ """
+ is_stylesheet = proc { |path| path.start_with? '/stylesheets' }
+ activate :asset_hash, rewrite_ignore: [
+ %r(javascripts/*),
+ '/subdir/*',
+ is_stylesheet
+ ]
+ activate :relative_assets
+ activate :directory_indexes
+ """
+ And a successfully built app at "asset-hash-app"
+ When I cd to "build"
+ Then the following files should exist:
+ | index.html |
+ | subdir/index.html |
+ | images/100px-5fd6fb90.jpg |
+ | javascripts/application-1d8d5276.js |
+ | stylesheets/site-8bc55985.css |
+ And the following files should not exist:
+ | images/100px.jpg |
+ | javascripts/application.js |
| stylesheets/site.css |
+ And the file "javascripts/application-1d8d5276.js" should contain "img.src = '/images/100px.jpg'"
+ And the file "stylesheets/site-8bc55985.css" should contain:
+ """
+ background-image: url("../images/100px.jpg")
+ """
+ And the file "index.html" should contain 'href="stylesheets/site-8bc55985.css"'
+ And the file "index.html" should contain 'src="javascripts/application-1d8d5276.js"'
+ And the file "index.html" should contain 'src="images/100px-5fd6fb90.jpg"'
+ And the file "subdir/index.html" should contain:
+ """
+
-
- puts "Is this mic on?"Image url3:
+
Welcome
" And the file "static.html" should contain "Static, no code!" And the file "services/index.html" should contain "Services" And the file "stylesheets/static.css" should contain "body" - + Scenario: Build glob Given a successfully built app at "glob-app" with flags "--glob '*.css'" When I cd to "build" @@ -34,16 +34,28 @@ Feature: Builder | index.html | Then the following files should exist: | stylesheets/site.css | - + Scenario: Build with errors Given a built app at "build-with-errors-app" Then the exit status should be 1 - + Scenario: Build empty errors Given a built app at "empty-app" Then the exit status should be 1 + Scenario: Build external_pipeline errors + Given a built app at "external-pipeline-error" + Then the exit status should be 1 + Scenario: Build alias (b) Given a fixture app "large-build-app" When I run `middleman b` - Then was successfully built \ No newline at end of file + Then was successfully built + + Scenario: Builded text file(ex: html, css, xml, txt)'s permission is 0644 + Given a successfully built app at "large-build-app" + When I cd to "build" + Then the mode of filesystem object "index.html" should match "0644" + And the mode of filesystem object "stylesheets/static.css" should match "0644" + And the mode of filesystem object "feed.xml" should match "0644" + And the mode of filesystem object ".htaccess" should match "0644" diff --git a/middleman-core/features/cache_buster.feature b/middleman-core/features/cache_buster.feature index 11040ba5..bea898e3 100644 --- a/middleman-core/features/cache_buster.feature +++ b/middleman-core/features/cache_buster.feature @@ -5,7 +5,7 @@ Feature: Generate mtime-based query string for busting browser caches Given "cache_buster" feature is "disabled" And the Server is running at "cache-buster-app" When I go to "/stylesheets/relative_assets.css" - Then I should see "blank.gif'" + Then I should see 'blank.gif"' Scenario: Rendering html with the feature disabled Given "cache_buster" feature is "disabled" @@ -39,4 +39,18 @@ Feature: Generate mtime-based query string for busting browser caches And the Server is running at "cache-buster-app" When I go to "/cache-buster.html" Then I should see "site.css?" - Then I should see "blank.gif?" \ No newline at end of file + Then I should see "blank.gif?" + + Scenario: URLs are not rewritten for rewrite ignored paths + Given a fixture app "cache-buster-app" + And a file named "config.rb" with: + """ + activate :cache_buster, rewrite_ignore: [ + '/cache-buster.html', + ] + """ + And the Server is running at "cache-buster-app" + When I go to "/cache-buster.html" + Then I should see 'site.css"' + Then I should see 'empty-with-include.js"' + Then I should see 'blank.gif"' diff --git a/middleman-core/features/chained_templates.feature b/middleman-core/features/chained_templates.feature index aed75b7c..27135bf6 100644 --- a/middleman-core/features/chained_templates.feature +++ b/middleman-core/features/chained_templates.feature @@ -7,13 +7,13 @@ Feature: Templates should be chainable Then I should see "Title" And I should see "Subtitle" And I should see "Sup" - + Scenario: Build chained template Given a successfully built app at "chained-app" When I cd to "build" Then the following files should exist: | index.html | - | test.erb.combobreaker | + | test.erb.combobreaker | And the file "index.html" should contain "Title" And the file "index.html" should contain "Subtitle" And the file "index.html" should contain "Sup" @@ -32,7 +32,7 @@ Feature: Templates should be chainable And a template named "my_partial.html.md.erb" with: """ ## My Partial - + <%= 'hello world' %> """ And the Server is running @@ -61,7 +61,7 @@ Feature: Templates should be chainable And a template named "my_partial.html.md.erb" with: """ ## My Partial - + <%= 'hello world' %> """ And the Server is running @@ -90,7 +90,7 @@ Feature: Templates should be chainable And a template named "my_partial.html.erb" with: """My Partial
- + <%= 'hello world' %> """ And the Server is running diff --git a/middleman-core/features/clean_build.feature b/middleman-core/features/clean_build.feature index e5254df4..60c18578 100644 --- a/middleman-core/features/clean_build.feature +++ b/middleman-core/features/clean_build.feature @@ -16,6 +16,22 @@ Feature: Build Clean | build/should_be_ignored3.html | And the file "build/index.html" should contain "Comment in layout" + Scenario: Clean build has a whitelist + Given a fixture app "clean-app" + When a file named "build/.test" with: + """ + Hello + """ + When a file named "config.rb" with: + """ + set :skip_build_clean do |path| + path =~ /\.test/ + end + """ + Given a built app at "clean-app" + Then the following files should exist: + | build/.test | + Scenario: Clean build an app with newly ignored files and a nested output directory Given a fixture app "clean-nested-app" When a file named "config.rb" with: @@ -42,3 +58,21 @@ Feature: Build Clean Then the following files should not exist: | sub/dir/about.html | | sub/dir/nested/nested.html | + + Scenario: Build and clean an app under a hidden directory + Given a fixture app "clean-app" + And app "clean-app" is using config "hidden-dir-before" + And a built app at "clean-app" + Then the following files should exist: + | .build/index.html | + | .build/should_be_ignored.html | + | .build/should_be_ignored2.html | + | .build/should_be_ignored3.html | + Given app "clean-app" is using config "hidden-dir-after" + And a built app at "clean-app" + Then the following files should exist: + | .build/index.html | + And the following files should not exist: + | .build/should_be_ignored.html | + | .build/should_be_ignored2.html | + | .build/should_be_ignored3.html | diff --git a/middleman-core/features/cli_init.feature b/middleman-core/features/cli_init.feature deleted file mode 100644 index 1bde5a54..00000000 --- a/middleman-core/features/cli_init.feature +++ /dev/null @@ -1,151 +0,0 @@ -Feature: Middleman CLI - - Scenario: Create a new project - Given I run `middleman init MY_PROJECT` - Then the exit status should be 0 - When I cd to "MY_PROJECT" - Then the following files should exist: - | Gemfile | - | .gitignore | - | config.rb | - | source/index.html.erb | - | source/images/background.png | - | source/images/middleman.png | - | source/layouts/layout.erb | - | source/javascripts/all.js | - | source/stylesheets/all.css | - | source/stylesheets/normalize.css | - - Scenario: Create a new project in the current directory - Given a directory named "MY_PROJECT" - When I cd to "MY_PROJECT" - And I run `middleman init` - Then the exit status should be 0 - And the following files should exist: - | Gemfile | - | config.rb | - | source/index.html.erb | - - Scenario: Create a new project (alias i) - When I run `middleman i MY_PROJECT` - Then a directory named "MY_PROJECT" should exist - - Scenario: Create a new project (alias new) - When I run `middleman new MY_PROJECT` - Then a directory named "MY_PROJECT" should exist - - Scenario: Create a new project (alias n) - When I run `middleman n MY_PROJECT` - Then a directory named "MY_PROJECT" should exist - - Scenario: Create a new project with Rack - When I run `middleman init MY_PROJECT --rack` - Then a directory named "MY_PROJECT" should exist - When I cd to "MY_PROJECT" - Then the following files should exist: - | config.rb | - | config.ru | - | Gemfile | - - Scenario: Create a new HTML5 project - When I run `middleman init MY_PROJECT --template=html5` - Then a directory named "MY_PROJECT" should exist - When I cd to "MY_PROJECT" - Then the following files should exist: - | config.rb | - | Gemfile | - Then the following files should not exist: - | config.ru | - And the file "config.rb" should contain "set :js_dir, 'js'" - Then a directory named "source" should exist - When I cd to "source" - Then the following files should exist: - | index.html.erb | - | layouts/layout.erb | - | humans.txt | - | js/main.js | - - Scenario: Create a new HTML5 project with Rack - When I run `middleman init MY_PROJECT --rack --template=html5` - Then a directory named "MY_PROJECT" should exist - When I cd to "MY_PROJECT" - Then the following files should exist: - | config.rb | - | config.ru | - | Gemfile | - - Scenario: Create a new Mobile HTML5 project - When I run `middleman init MY_PROJECT --template=mobile` - Then a directory named "MY_PROJECT" should exist - When I cd to "MY_PROJECT" - Then the following files should exist: - | config.rb | - | Gemfile | - Then the following files should not exist: - | config.ru | - Then a directory named "source" should exist - When I cd to "source" - Then the following files should exist: - | index.html | - | humans.txt | - | js/libs/respond.min.js | - - Scenario: Create a new Mobile HTML5 project with Rack - When I run `middleman init MY_PROJECT --rack --template=mobile` - Then a directory named "MY_PROJECT" should exist - When I cd to "MY_PROJECT" - Then the following files should exist: - | config.rb | - | config.ru | - | Gemfile | - - Scenario: Enforce creation of Mobile HTML5 project - When I run `middleman init MY_PROJECT --template=mobile` - When I run `middleman init MY_PROJECT --template=mobile --force` - Then a directory named "MY_PROJECT" should exist - And the output should contain: - """ - identical - """ - And the output should contain: - """ - exist - """ - Scenario: Enforce creation of HTML5 project - When I run `middleman init MY_PROJECT --template=html5` - When I run `middleman init MY_PROJECT --template=html5 --force` - Then a directory named "MY_PROJECT" should exist - And the output should contain: - """ - identical - """ - And the output should contain: - """ - exist - """ - - Scenario: Enforce creation of default project - When I run `middleman init MY_PROJECT --template=default` - When I run `middleman init MY_PROJECT --template=default --force` - Then a directory named "MY_PROJECT" should exist - And the output should contain: - """ - identical - """ - And the output should contain: - """ - exist - """ - - Scenario: Enforce creation of empty project - When I run `middleman init MY_PROJECT --template=empty` - When I run `middleman init MY_PROJECT --template=empty --force` - Then a directory named "MY_PROJECT" should exist - And the output should contain: - """ - identical - """ - And the output should contain: - """ - exist - """ diff --git a/middleman-core/features/collections.feature b/middleman-core/features/collections.feature new file mode 100644 index 00000000..2d313a3c --- /dev/null +++ b/middleman-core/features/collections.feature @@ -0,0 +1,265 @@ +Feature: Collections + Scenario: Lazy query + Given a fixture app "collections-app" + And a file named "config.rb" with: + """ + articles1 = collection :articles1, resources.select { |r| + matcher = ::Middleman::Util::UriTemplates.uri_template('blog1/{year}-{month}-{day}-{title}.html') + ::Middleman::Util::UriTemplates.extract_params(matcher, ::Middleman::Util.normalize_path(r.url)) + } + + everything = resources.select do |r| + true + end + + def get_tags(resource) + if resource.data.tags.is_a? String + resource.data.tags.split(',').map(&:strip) + else + resource.data.tags + end + end + + def group_lookup(resource, sum) + results = Array(get_tags(resource)).map(&:to_s).map(&:to_sym) + + results.each do |k| + sum[k] ||= [] + sum[k] << resource + end + end + + tags = everything + .select { |resource| resource.data.tags } + .each_with_object({}, &method(:group_lookup)) + + class Wrapper + attr_reader :stuff + + def initialize + @stuff = Set.new + end + + def <<((k, v)) + @stuff << k + self + end + end + + collection :wrapped, tags.reduce(Wrapper.new, :<<) + + set :tags, tags # Expose to templates + + collection :first_tag, tags.keys.sort.first + """ + And a file named "source/index.html.erb" with: + """ + <% collection(:articles1).each do |article| %> + Article1: <%= article.data.title %> + <% end %> + + Tag Count: <%= collection(:wrapped).stuff.length %> + + <% config[:tags].value.each do |k, items| %> + Tag: <%= k %> (<%= items.length %>) + <% items.each do |article| %> + Article (<%= k %>): <%= article.data.title %> + <% end %> + <% end %> + + First Tag: <%= collection(:first_tag) %> + """ + Given the Server is running at "collections-app" + When I go to "index.html" + Then I should see 'Article1: Blog1 Newer Article' + And I should see 'Article1: Blog1 Another Article' + And I should see 'Tag: foo (4)' + And I should see 'Article (foo): Blog1 Newer Article' + And I should see 'Article (foo): Blog1 Another Article' + And I should see 'Article (foo): Blog2 Newer Article' + And I should see 'Article (foo): Blog2 Another Article' + And I should see 'Tag: bar (2)' + And I should see 'Article (bar): Blog1 Newer Article' + And I should see 'Article (bar): Blog2 Newer Article' + And I should see 'Tag: 120 (1)' + And I should see 'Article (120): Blog1 Another Article' + And I should see 'First Tag: 120' + And I should see 'Tag Count: 3' + + Scenario: Collected resources update with file changes + Given a fixture app "collections-app" + And a file named "config.rb" with: + """ + collection :articles, resources.select { |r| + matcher = ::Middleman::Util::UriTemplates.uri_template('blog2/{year}-{month}-{day}-{title}.html') + ::Middleman::Util::UriTemplates.extract_params(matcher, ::Middleman::Util.normalize_path(r.url)) + } + """ + And a file named "source/index.html.erb" with: + """ + <% collection(:articles).each do |article| %> + Article: <%= article.data.title || article.file_descriptor[:relative_path] %> + <% end %> + """ + Given the Server is running at "collections-app" + When I go to "index.html" + Then I should not see "Article: index.html.erb" + Then I should see 'Article: Blog2 Newer Article' + And I should see 'Article: Blog2 Another Article' + + And the file "source/blog2/2011-01-02-another-article.html.markdown" has the contents + """ + --- + title: "Blog3 Another Article" + date: 2011-01-02 + tags: + - foo + --- + + Another Article Content + + """ + When I go to "index.html" + Then I should see "Article: Blog2 Newer Article" + And I should not see "Article: Blog2 Another Article" + And I should see 'Article: Blog3 Another Article' + + And the file "source/blog2/2011-01-01-new-article.html.markdown" is removed + When I go to "index.html" + Then I should not see "Article: Blog2 Newer Article" + And I should see 'Article: Blog3 Another Article' + + And the file "source/blog2/2014-01-02-yet-another-article.html.markdown" has the contents + """ + --- + title: "Blog2 Yet Another Article" + date: 2011-01-02 + tags: + - foo + --- + + Yet Another Article Content + """ + When I go to "index.html" + And I should see 'Article: Blog3 Another Article' + And I should see 'Article: Blog2 Yet Another Article' + + Scenario: Work with local helpers + Given a fixture app "collections-app" + And a file named "config.rb" with: + """ + module TestHelper + def help_me + "ok" + end + end + + include TestHelper + + data.articles.each_with_index do |a, i| + proxy "/#{i}-#{help_me}.html", a + end + """ + And a file named "data/articles.yaml" with: + """ + --- + - "/blog1/2011-01-01-new-article.html" + - "/blog2/2011-01-02-another-article.html" + """ + Given the Server is running at "collections-app" + When I go to "0-ok.html" + Then I should see 'Newer Article Content' + When I go to "1-ok.html" + Then I should see 'Another Article Content' + + Scenario: Collected data update with file changes + Given a fixture app "collections-app" + And a file named "config.rb" with: + """ + data.articles.each_with_index do |a, i| + proxy "/#{i}.html", a + end + """ + And a file named "data/articles.yaml" with: + """ + --- + - "/blog1/2011-01-01-new-article.html" + - "/blog2/2011-01-02-another-article.html" + """ + Given the Server is running at "collections-app" + When I go to "0.html" + Then I should see 'Newer Article Content' + When I go to "1.html" + Then I should see 'Another Article Content' + When I go to "2.html" + Then I should see 'Not Found' + + When the file "data/articles.yaml" has the contents + """ + --- + - "/blog1/2011-01-01-new-article.html" + """ + When I go to "0.html" + Then I should see 'Newer Article Content' + When I go to "1.html" + Then I should see 'Not Found' + When I go to "2.html" + Then I should see 'Not Found' + + When the file "data/articles.yaml" has the contents + """ + --- + - "/blog2/2011-01-02-another-article.html" + - "/blog1/2011-01-01-new-article.html" + - "/blog2/2011-01-01-new-article.html" + """ + When I go to "0.html" + Then I should see 'Another Article Content' + When I go to "1.html" + Then I should see 'Newer Article Content' + When I go to "2.html" + Then I should see 'Again' + + Scenario: Arbitrary live datasets + Given a fixture app "collections-app" + And a file named "config.rb" with: + """ + ignore "/description_template.html" + + live { + 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) + } + end + """ + And a file named "source/description_template.html.erb" with: + """ + <%= contents %> + """ + And a file named "descriptions/test1.txt" with: + """ + Test1 + """ + Given the Server is running at "collections-app" + When I go to "test1.html" + Then I should see 'Test1' + When I go to "test2.html" + Then I should see 'Not Found' + + When the file "descriptions/test2.txt" has the contents + """ + Test2 + """ + When I go to "test1.html" + Then I should see 'Test1' + When I go to "test2.html" + Then I should see 'Test2' + + When the file "descriptions/test1.txt" is removed + When I go to "test1.html" + Then I should see 'Not Found' + When I go to "test2.html" + Then I should see 'Test2' diff --git a/middleman-core/features/compass-sprites.feature b/middleman-core/features/compass-sprites.feature deleted file mode 100644 index 871c277a..00000000 --- a/middleman-core/features/compass-sprites.feature +++ /dev/null @@ -1,6 +0,0 @@ -Feature: Compass sprites should be generated on build and copied - Scenario: Building a clean site with sprites - Given a successfully built app at "compass-sprites-app" - When I cd to "build" - Then the following files should exist: - | images/icon-s0de2218f58.png | \ No newline at end of file diff --git a/middleman-core/features/console.feature b/middleman-core/features/console.feature index c3400e3b..1bd55809 100644 --- a/middleman-core/features/console.feature +++ b/middleman-core/features/console.feature @@ -1,8 +1,9 @@ Feature: Console Scenario: Enter and exit the console - Given I run `middleman console` interactively - When I type "puts 'Hello from the console.'" + Given a fixture app "large-build-app" + When I run `middleman console` interactively + And I type "puts 'Hello from the console.'" And I type "exit" Then it should pass with: """ diff --git a/middleman-core/features/content_type.feature b/middleman-core/features/content_type.feature index 95aeadab..8d05d6a5 100644 --- a/middleman-core/features/content_type.feature +++ b/middleman-core/features/content_type.feature @@ -19,8 +19,8 @@ Feature: Setting the right content type for files 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" diff --git a/middleman-core/features/current_page_request_path_backwards.feature b/middleman-core/features/current_page_request_path_backwards.feature deleted file mode 100644 index 41853e75..00000000 --- a/middleman-core/features/current_page_request_path_backwards.feature +++ /dev/null @@ -1,6 +0,0 @@ -Feature: Support old request.path object used by many extensions - - Scenario: Viewing the root path - Given the Server is running at "current-page-app" - When I go to "/request-path.html" - Then I should see "true" \ No newline at end of file diff --git a/middleman-core/features/custom_layouts.feature b/middleman-core/features/custom_layouts.feature index 32feaa99..dfe52344 100644 --- a/middleman-core/features/custom_layouts.feature +++ b/middleman-core/features/custom_layouts.feature @@ -1,26 +1,38 @@ 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" + Scenario: Using custom :layout attribute with proxy + Given a fixture app "custom-layout-app2" + And a file named "config.rb" with: + """ + page '/test/*', layout: :custom + proxy "/test/me.html", "/custom-layout.html" + live { %w(you) }.each do |who| + proxy "/test/#{who}.html", "/custom-layout.html" + end + """ And the Server is running at "custom-layout-app2" - When I go to "/custom-layout.html" + When I go to "/test/me.html" Then I should see "Custom Layout" - + When I go to "/test/you.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 +40,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 +54,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 +68,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" @@ -61,4 +81,4 @@ Feature: Custom layouts When I go to "/path/index.html" Then I should see "Alt" And I should see "Monde" - And I should not see "Hello" \ No newline at end of file + And I should not see "Hello" diff --git a/middleman-core/features/data.feature b/middleman-core/features/data.feature index fcce8445..db8bede6 100644 --- a/middleman-core/features/data.feature +++ b/middleman-core/features/data.feature @@ -51,3 +51,10 @@ Feature: Local Data API Then I should see "title1:Hello" Then I should see "title2:More" Then I should see "title3:Stuff" + + Scenario: Using data postscript + Given the Server is running at "nested-data-app" + When I go to "/extracontent.html" + Then I should see "With Content
" + Then I should see 'Header 2
' + Then I should see "Paragraph 1
" diff --git a/middleman-core/features/default-layout.feature b/middleman-core/features/default-layout.feature new file mode 100644 index 00000000..82fbeeff --- /dev/null +++ b/middleman-core/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: + """ +This is the title
" - 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 "This is the title
" Then I should see "This is the title" - 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 "This is the title
" - 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 "This is the title
" - Then I should see " + FileA <%= current_page.data.title %> """ And the file "source/front-matter-change.html.erb.frontmatter" has the contents """ @@ -67,6 +43,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 +54,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" @@ -150,21 +130,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" diff --git a/middleman-core/features/front-matter.feature b/middleman-core/features/front-matter.feature index 4625906f..64bcb94b 100644 --- a/middleman-core/features/front-matter.feature +++ b/middleman-core/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 "This is the title
" - Then I should not see "---" When I go to "/front-matter-2.php" Then I should see "This is the title
" Then I should see "This is the title" + 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 "" 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 "This is the title
" 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 "This is the title
" - Then I should not see ";;;" - When I go to "/json-front-matter.html" - Then I should see "This is the title
" - Then I should not see ";;;" - When I go to "/json-front-matter-2.php" - Then I should see "This is the title
" - Then I should see "" - 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 "This is the title
" - Then I should not see ";;;" Scenario: A template changes frontmatter during preview Given the Server is running at "frontmatter-app" diff --git a/middleman-core/features/gzip.feature b/middleman-core/features/gzip.feature index 2f74cc9a..643972bc 100644 --- a/middleman-core/features/gzip.feature +++ b/middleman-core/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: diff --git a/middleman-core/features/helpers_content_tag.feature b/middleman-core/features/helpers_content_tag.feature index 4c54aae7..16d57957 100644 --- a/middleman-core/features/helpers_content_tag.feature +++ b/middleman-core/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, "paragraph
" + + + Scenario: Markdown filter in Slim uses our link_to and image_tag helpers (with Kramdown) + Given a fixture app "markdown-in-slim-app" + And a file named "config.rb" with: + """ + set :markdown_engine, :kramdown + activate :directory_indexes + """ + And a file named "source/link_and_image.html.slim" with: + """ + markdown: + [A link](/link_target.html) + + {: srcset="image_2x.jpg 2x"} + """ + Given the Server is running at "markdown-in-slim-app" + When I go to "/link_and_image/" + Then I should see "/link_target/" + Then I should see "/images/image_2x.jpg 2x" + Then I should see 'src="/images/blank.gif"' diff --git a/middleman-core/features/markdown_redcarpet.feature b/middleman-core/features/markdown_redcarpet.feature index 7eec709b..c0f744ac 100644 --- a/middleman-core/features/markdown_redcarpet.feature +++ b/middleman-core/features/markdown_redcarpet.feature @@ -1,4 +1,3 @@ -@nojava Feature: Markdown (Redcarpet) support In order to test included Redcarpet support @@ -7,14 +6,14 @@ Feature: Markdown (Redcarpet) support And a file named "config.rb" with: """ set :markdown_engine, :redcarpet - set :markdown, :no_intra_emphasis => true, - :tables => true, - :fenced_code_blocks => true, - :autolink => true, - :strikethrough => true, - :space_after_headers => true, - :superscript => true, - :lax_spacing => true + set :markdown, no_intra_emphasis: true, + tables: true, + fenced_code_blocks: true, + autolink: true, + strikethrough: true, + space_after_headers: true, + superscript: true, + lax_spacing: true """ Given the Server is running at "markdown-app" @@ -42,9 +41,9 @@ Feature: Markdown (Redcarpet) support And a file named "config.rb" with: """ set :markdown_engine, :redcarpet - set :markdown, :underline => true, - :highlight => true, - :disable_indented_code_blocks => true + set :markdown, underline: true, + highlight: true, + disable_indented_code_blocks: true """ Given the Server is running at "markdown-app" When I go to "/underline.html" @@ -59,7 +58,7 @@ Feature: Markdown (Redcarpet) support And a file named "config.rb" with: """ set :markdown_engine, :redcarpet - set :markdown, :smartypants => true + set :markdown, smartypants: true """ Given the Server is running at "markdown-app" When I go to "/smarty_pants.html" @@ -70,13 +69,13 @@ Feature: Markdown (Redcarpet) support And a file named "config.rb" with: """ set :markdown_engine, :redcarpet - set :markdown, :filter_html => true, - :no_images => true, - :no_links => true, - :with_toc_data => true, - :hard_wrap => true, - :safe_links_only => true, - :prettify => true + set :markdown, filter_html: true, + no_images: true, + no_links: true, + with_toc_data: true, + hard_wrap: true, + safe_links_only: true, + prettify: true """ Given the Server is running at "markdown-app" @@ -103,7 +102,7 @@ Feature: Markdown (Redcarpet) support And a file named "config.rb" with: """ set :markdown_engine, :redcarpet - set :markdown, :link_attributes => { :target => "_blank" } + set :markdown, link_attributes: { target: "_blank" } """ And a file named "source/link.html.markdown" with: """ @@ -118,8 +117,8 @@ Feature: Markdown (Redcarpet) support And a file named "config.rb" with: """ set :markdown_engine, :redcarpet - set :markdown, :xhtml => true, - :hard_wrap => true + set :markdown, xhtml: true, + hard_wrap: true """ Given the Server is running at "markdown-app" When I go to "/hard_wrap.html" @@ -130,7 +129,7 @@ Feature: Markdown (Redcarpet) support And a file named "config.rb" with: """ set :markdown_engine, :redcarpet - set :markdown, :smartypants => true + set :markdown, smartypants: true """ Given the Server is running at "markdown-frontmatter-options-app" When I go to "/smarty_pants-default.html" diff --git a/middleman-core/features/markdown_redcarpet_in_haml.feature b/middleman-core/features/markdown_redcarpet_in_haml.feature index a0f10160..c8adfd73 100644 --- a/middleman-core/features/markdown_redcarpet_in_haml.feature +++ b/middleman-core/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 diff --git a/middleman-core/features/markdown_redcarpet_in_slim.feature b/middleman-core/features/markdown_redcarpet_in_slim.feature new file mode 100644 index 00000000..250c6857 --- /dev/null +++ b/middleman-core/features/markdown_redcarpet_in_slim.feature @@ -0,0 +1,41 @@ +Feature: Markdown support in Slim + In order to test support of the Slim markdown filter + + Scenario: Markdown filter in Slim works + Given a fixture app "markdown-in-slim-app" + And a file named "config.rb" with: + """ + set :markdown_engine, :redcarpet + activate :directory_indexes + """ + And a file named "source/markdown_filter.html.slim" with: + """ + markdown: + # H1 + + paragraph + """ + Given the Server is running at "markdown-in-slim-app" + When I go to "/markdown_filter/" + Then I should see ">H1" + Then I should see "paragraph
" + + + Scenario: Markdown filter in Slim uses our link_to and image_tag helpers + Given a fixture app "markdown-in-slim-app" + And a file named "config.rb" with: + """ + set :markdown_engine, :redcarpet + activate :directory_indexes + """ + And a file named "source/link_and_image.html.slim" with: + """ + markdown: + [A link](/link_target.html) + +  + """ + Given the Server is running at "markdown-in-slim-app" + When I go to "/link_and_image/" + Then I should see "/link_target/" + Then I should see 'src="/images/blank.gif"' diff --git a/middleman-core/features/minify_css.feature b/middleman-core/features/minify_css.feature index 29c3e8c6..cbf03fe3 100644 --- a/middleman-core/features/minify_css.feature +++ b/middleman-core/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 "50" lines + 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,13 @@ 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 """ @@ -42,24 +47,25 @@ Feature: Minify CSS 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 end end - activate :minify_css - - set :css_compressor, ::PassThrough + activate :minify_css, compressor: ::PassThrough """ And the Server is running at "passthrough-app" When I go to "/stylesheets/site.css" - Then I should see "46" lines + Then I should see "5" lines Scenario: Rendering inline css with the feature disabled 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" @@ -72,22 +78,22 @@ Feature: Minify CSS } """ - + 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 end end - activate :minify_css, :inline => true + activate :minify_css, inline: true, compressor: ::PassThrough - set :css_compressor, ::PassThrough - - page "/inline-css.html", :layout => false + page "/inline-css.html", layout: false """ And the Server is running at "passthrough-app" When I go to "/inline-css.html" @@ -104,15 +110,17 @@ 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" end end - activate :minify_css, :inline => true, :compressor => ::HelloCompressor + activate :minify_css, inline: true, compressor: ::HelloCompressor - page "/inline-css.html", :layout => false + page "/inline-css.html", layout: false """ And the Server is running at "passthrough-app" When I go to "/inline-css.html" @@ -122,12 +130,14 @@ Feature: Minify CSS Hello """ - + Scenario: Rendering inline css with the feature enabled Given a fixture app "minify-css-app" And a file named "config.rb" with: """ - activate :minify_css, :inline => true + 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.html" @@ -142,7 +152,9 @@ Feature: Minify CSS Given a fixture app "minify-css-app" And a file named "config.rb" with: """ - activate :minify_css, :inline => true + 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" @@ -159,7 +171,9 @@ Feature: Minify CSS Given a fixture app "minify-css-app" And a file named "config.rb" with: """ - activate :minify_css, :inline => true + 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" @@ -176,6 +190,8 @@ Feature: Minify CSS 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, diff --git a/middleman-core/features/minify_javascript.feature b/middleman-core/features/minify_javascript.feature index a8235368..262d977a 100644 --- a/middleman-core/features/minify_javascript.feature +++ b/middleman-core/features/minify_javascript.feature @@ -38,7 +38,7 @@ Feature: Minify Javascript I'm a jQuery {{template}}. """ - + Scenario: Rendering inline js with a passthrough minifier Given a fixture app "passthrough-app" And a file named "config.rb" with: @@ -49,11 +49,9 @@ Feature: Minify Javascript end end - activate :minify_javascript, :inline => true + activate :minify_javascript, inline: true, compressor: ::PassThrough - set :js_compressor, ::PassThrough - - page "/inline-js.html", :layout => false + page "/inline-js.html", layout: false """ And the Server is running at "passthrough-app" When I go to "/inline-js.html" @@ -98,9 +96,9 @@ Feature: Minify Javascript end end - activate :minify_javascript, :inline => true, :compressor => ::HelloCompressor + activate :minify_javascript, inline: true, compressor: ::HelloCompressor - page "/inline-js.html", :layout => false + page "/inline-js.html", layout: false """ And the Server is running at "passthrough-app" When I go to "/inline-js.html" @@ -121,12 +119,12 @@ Feature: Minify Javascript I'm a jQuery {{template}}. """ - + Scenario: Rendering inline js with the feature enabled 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.html" @@ -152,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" @@ -177,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" @@ -195,7 +193,7 @@ Feature: Minify Javascript Then I should see "1" lines When I go to "/more-js/other.js" Then I should see "1" lines - + Scenario: Rendering external js in a proxied resource Given a fixture app "minify-js-app" And a file named "config.rb" with: @@ -216,12 +214,12 @@ 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-coffeescript.html" Then I should see "3" lines - + Scenario: Rendering external js (coffeescript) with the feature enabled Given a fixture app "minify-js-app" And a file named "config.rb" with: @@ -231,7 +229,7 @@ Feature: Minify Javascript And the Server is running at "minify-js-app" When I go to "/javascripts/coffee_test.js" Then I should see "1" lines - + Scenario: Rendering inline js (coffeescript) with a passthrough minifier Given a fixture app "passthrough-app" And a file named "config.rb" with: @@ -242,16 +240,14 @@ Feature: Minify Javascript end end - activate :minify_javascript, :inline => true + activate :minify_javascript, inline: true, compressor: ::PassThrough - set :js_compressor, ::PassThrough - - page "/inline-coffeescript.html", :layout => false + page "/inline-coffeescript.html", layout: false """ And the Server is running at "passthrough-app" When I go to "/inline-coffeescript.html" Then I should see "13" lines - + Scenario: Rendering external js (coffeescript) with a passthrough minifier Given a fixture app "passthrough-app" And a file named "config.rb" with: @@ -262,11 +258,9 @@ Feature: Minify Javascript end end - activate :minify_javascript - - set :js_compressor, ::PassThrough + activate :minify_javascript, compressor: ::PassThrough """ And the Server is running at "passthrough-app" When I go to "/javascripts/coffee_test.js" Then I should see "11" lines - \ No newline at end of file + diff --git a/middleman-core/features/more-implied_extensions.feature b/middleman-core/features/more-implied_extensions.feature deleted file mode 100644 index 10ee5b20..00000000 --- a/middleman-core/features/more-implied_extensions.feature +++ /dev/null @@ -1,44 +0,0 @@ -Feature: More default extensions - - Scenario: Default extensions preview - Given the Server is running at "more-implied-extensions-app" - When I go to "/test.html" - Then I should see "Hello" - When I go to "/test2.html" - Then I should see "World" - When I go to "/test3.html" - Then I should see "Howdy" - When I go to "/test4.html" - Then I should see "HELLO" - When I go to "/javascripts/app.js" - Then I should see "derp" - Then I should not see "I am in the layout" - When I go to "/stylesheets/style.css" - Then I should see "section" - Then I should not see "I am in the layout" - When I go to "/stylesheets/style2.css" - Then I should see "section" - Then I should not see "I am in the layout" - - Scenario: Default extensions build - Given a fixture app "more-implied-extensions-app" - And a successfully built app at "more-implied-extensions-app" - When I cd to "build" - Then the following files should exist: - | test.html | - | test2.html | - | test3.html | - | test4.html | - | javascripts/app.js | - | stylesheets/style.css | - | stylesheets/style2.css | - And the file "test.html" should contain "Hello" - And the file "test2.html" should contain "World" - And the file "test3.html" should contain "Howdy" - And the file "test4.html" should contain "HELLO" - And the file "javascripts/app.js" should contain "derp" - And the file "javascripts/app.js" should not contain "I am in the layout" - And the file "stylesheets/style.css" should contain "section" - And the file "stylesheets/style.css" should not contain "I am in the layout" - And the file "stylesheets/style2.css" should contain "section" - And the file "stylesheets/style2.css" should not contain "I am in the layout" diff --git a/middleman-core/features/more-instance_vars.feature b/middleman-core/features/more-instance_vars.feature deleted file mode 100644 index 87fc3b0d..00000000 --- a/middleman-core/features/more-instance_vars.feature +++ /dev/null @@ -1,18 +0,0 @@ -Feature: Instance Vars - In order to share data with layouts and partials via instance variables - - Scenario: Setting an instance var in a template should be visible in its layout - Given the Server is running at "more-instance-vars-app" - When I go to "/instance-var-set.html" - Then I should see "Var is 100" - - Scenario: Setting an instance var in a template should be visible in a partial - Given the Server is running at "more-instance-vars-app" - When I go to "/instance-var-set.html" - Then I should see "My var is here!" - - Scenario: Setting an instance var in one file should not be visible in another - Given the Server is running at "more-instance-vars-app" - When I go to "/instance-var-set.html" - When I go to "/no-instance-var.html" - Then I should see "No var..." diff --git a/middleman-core/features/mount_rack.feature b/middleman-core/features/mount_rack.feature index b2dbe5a0..dcb83146 100644 --- a/middleman-core/features/mount_rack.feature +++ b/middleman-core/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" diff --git a/middleman-core/features/move_files.feature b/middleman-core/features/move_files.feature new file mode 100644 index 00000000..a6b1e975 --- /dev/null +++ b/middleman-core/features/move_files.feature @@ -0,0 +1,44 @@ +Feature: Move files + + Scenario: Move one path to another + Given a fixture app "large-build-app" + And a file named "config.rb" with: + """ + move_file "/static.html", "/static2.html" + """ + And the Server is running at "large-build-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: Move one path to another with directory indexes + Given a fixture app "large-build-app" + And a file named "config.rb" with: + """ + activate :directory_indexes + move_file "/static.html", "/static2.html" + """ + And the Server is running at "large-build-app" + When I go to "/static.html" + Then I should see 'Not Found' + When I go to "/static/index.html" + Then I should see 'Not Found' + When I go to "/static2.html" + Then I should see 'Static, no code!' + + Scenario: Move one path to another with directory indexes (using dest path) + Given a fixture app "large-build-app" + And a file named "config.rb" with: + """ + activate :directory_indexes + move_file "/static/index.html", "/static2.html" + """ + And the Server is running at "large-build-app" + When I go to "/static.html" + Then I should see 'Not Found' + When I go to "/static/index.html" + Then I should see 'Not Found' + When I go to "/static2.html" + Then I should see 'Static, no code!' + diff --git a/middleman-core/features/multiple-sources.feature b/middleman-core/features/multiple-sources.feature new file mode 100644 index 00000000..4f23474a --- /dev/null +++ b/middleman-core/features/multiple-sources.feature @@ -0,0 +1,35 @@ +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" + + Scenario: Set source with destination_dir + Given the Server is running at "multiple-sources-with-duplicate-file-names-app" + When I go to "/index.html" + Then I should see "Default Source" + + When I go to "/source2/index.html" + Then I should see "Second Source" diff --git a/middleman-core/features/nested_layouts.feature b/middleman-core/features/nested_layouts.feature index d70a7e23..f51831fb 100644 --- a/middleman-core/features/nested_layouts.feature +++ b/middleman-core/features/nested_layouts.feature @@ -5,37 +5,37 @@ Feature: Allow nesting of layouts When I go to "/index.html" Then I should see: """ - Master + Master ErbIndex Title
- Outer - Inner + I am Outer + I am Inner Template - + """ When I go to "/another.html" Then I should see: """ - Master + Master ErbNew Article Title
- Outer - Inner + I am Outer + I am InnerThe Article Content
""" - + Scenario: A page uses an inner layout when uses an outer layout (slim) Given the Server is running at "nested-layout-app" When I go to "/slim-test.html" - Then I should see "Master
New Article Title
Outer
Inner
The Article Content
" - + Then I should see "Master Slim
New Article Title
I am Outer
I am Inner
The Article Content
" + Scenario: A page uses an inner layout when uses an outer layout (haml) Given the Server is running at "nested-layout-app" When I go to "/haml-test.html" Then I should see: """ - Master + Master HamlNew Article Title
- Outer - Inner + I am Outer + I am InnerThe Article Content
""" @@ -43,13 +43,16 @@ Feature: Allow nesting of layouts Given the Server is running at "nested-layout-app" When I go to "/data-one.html" Then I should see "Page Number One" - And I should see "Inner" + And I should see "Page #1" + And I should see "I am Inner" + And I should see "I am Outer" + And I should see "Master Erb" When I go to "/data-two.html" Then I should see "Page Number Two" - And I should not see "Inner" + And I should not see "I am Inner" When I go to "/data-one.html" Then I should see "Page Number One" - And I should see "Inner" + And I should see "I am Inner" When I go to "/data-two.html" Then I should see "Page Number Two" - And I should not see "Inner" + And I should not see "I am Inner" diff --git a/middleman-core/features/page-id.feature b/middleman-core/features/page-id.feature new file mode 100644 index 00000000..74d08cb5 --- /dev/null +++ b/middleman-core/features/page-id.feature @@ -0,0 +1,72 @@ +Feature: Page IDs + + Scenario: link_to works with blocks (erb) + Given the Server is running at "page-id-app" + When I go to "/index.html" + Then I should see "I am: index" + And I should see "URL1: /fm.html" + And I should see "URL2: /2.html" + And I should see 'URL3: Hi' + And I should see 'URL4: Sym' + And I should see 'URL5: Imp' + And I should see 'URL6: Foldern' + And I should see 'URL7: Feed' + + When I go to "/fm.html" + Then I should see "I am: frontmatter" + When I go to "/implicit.html" + Then I should see "I am: implicit" + When I go to "/feed.xml" + Then I should see "I am: feed.xml" + When I go to "/folder/foldern.html" + Then I should see "I am: folder/foldern" + + When I go to "/1.html" + Then I should see "I am: page1" + When I go to "/2.html" + Then I should see "I am: page2" + When I go to "/3.html" + Then I should see "I am: page3" + + When I go to "/overwrites/from-default.html" + Then I should see "I am: something-else" + + When I go to "/overwrites/from-frontmatter.html" + Then I should see "I am: from_frontmatter" + + Scenario: Override page ID derivation with a proc + Given a fixture app "page-id-app" + And app "page-id-app" is using config "proc" + And the Server is running at "page-id-app" + + When I go to "/index.html" + Then I should see "I am: index.html-foo" + And I should see "URL1: /fm.html" + And I should see "URL2: /2.html" + And I should see 'URL3: Hi' + And I should see 'URL4: Sym' + And I should see 'URL8: Imp' + And I should see 'URL9: Foldern' + And I should see 'URL10: Feed' + + When I go to "/fm.html" + Then I should see "I am: frontmatter" + When I go to "/implicit.html" + Then I should see "I am: implicit.html-foo" + When I go to "/feed.xml" + Then I should see "I am: feed.xml-foo" + When I go to "/folder/foldern.html" + Then I should see "I am: folder/foldern.html-foo" + + When I go to "/1.html" + Then I should see "I am: page1" + When I go to "/2.html" + Then I should see "I am: page2" + When I go to "/3.html" + Then I should see "I am: page3" + + When I go to "/overwrites/from-default.html" + Then I should see "I am: something-else" + + When I go to "/overwrites/from-frontmatter.html" + Then I should see "I am: from_frontmatter" diff --git a/middleman-core/features/paginate.feature b/middleman-core/features/paginate.feature new file mode 100644 index 00000000..9338e019 --- /dev/null +++ b/middleman-core/features/paginate.feature @@ -0,0 +1,204 @@ +Feature: Pagination + Scenario: Basic configuration + Given a fixture app "paginate-app" + And a file named "config.rb" with: + """ + articles = resources.select { |r| + matcher = ::Middleman::Util::UriTemplates.uri_template('blog/2011-{remaining}') + ::Middleman::Util::UriTemplates.extract_params(matcher, ::Middleman::Util.normalize_path(r.url)) + } + + articles.sort { |a, b| + b.data.date <=> a.data.date + }.per_page(5) do |items, num, meta, is_last| + page_path = num == 1 ? '/2011/index.html' : "/2011/page/#{num}.html" + + prev_page = case num + when 1 + nil + when 2 + '/2011/index.html' + when 3 + "/2011/page/#{num-1}.html" + end + + next_page = is_last ? nil : "/2011/page/#{num+1}.html" + + proxy page_path, "/archive/2011/index.html", locals: { + items: items, + pagination: meta, + prev_page: prev_page, + next_page: next_page + } + end + + def get_tags(resource) + if resource.data.tags.is_a? String + resource.data.tags.split(',').map(&:strip) + else + resource.data.tags + end + end + + def group_lookup(resource, sum) + results = Array(get_tags(resource)).map(&:to_s).map(&:to_sym) + + results.each do |k| + sum[k] ||= [] + sum[k] << resource + end + end + + tags = articles + .select { |resource| resource.data.tags } + .each_with_object({}, &method(:group_lookup)) + + tags.each do |k, articles_in_tag| + articles_in_tag.sort { |a, b| + b.data.date <=> a.data.date + }.per_page(2).each do |items, num, meta, is_last| + page_path = num == 1 ? "/tags/#{k}.html" : "/tags/#{k}/page/#{num}.html" + + prev_page = case num + when 1 + nil + when 2 + "/tags/#{k}.html" + when 3 + "/tags/#{k}/page/#{num-1}.html" + end + + next_page = is_last ? nil : "/tags/#{k}/page/#{num+1}.html" + + proxy page_path, "/archive/2011/index.html", locals: { + items: items, + pagination: meta, + prev_page: prev_page, + next_page: next_page + } + end + end + """ + And the Server is running + When I go to "/2011/index.html" + Then I should see "Paginate: true" + Then I should see "Article Count: 5" + Then I should see "Page Num: 1" + Then I should see "Num Pages: 2" + Then I should see "Per Page: 5" + Then I should see "Page Start: 1" + Then I should see "Page End: 5" + Then I should see "Next Page: '/2011/page/2.html'" + Then I should see "Prev Page: ''" + Then I should not see "/blog/2011-01-01-test-article.html" + Then I should not see "/blog/2011-01-02-test-article.html" + Then I should see "/blog/2011-01-03-test-article.html" + Then I should see "/blog/2011-01-04-test-article.html" + Then I should see "/blog/2011-01-05-test-article.html" + Then I should see "/blog/2011-02-01-test-article.html" + Then I should see "/blog/2011-02-02-test-article.html" + + When I go to "/2011/page/2.html" + Then I should see "Article Count: 2" + Then I should see "Page Num: 2" + Then I should see "Page Start: 6" + Then I should see "Page End: 7" + Then I should see "Next Page: ''" + Then I should see "Prev Page: '/2011/'" + Then I should see "/2011-01-01-test-article.html" + Then I should see "/2011-01-02-test-article.html" + Then I should not see "/2011-01-03-test-article.html" + Then I should not see "/2011-01-04-test-article.html" + Then I should not see "/2011-01-05-test-article.html" + Then I should not see "/2011-02-01-test-article.html" + Then I should not see "/2011-02-02-test-article.html" + + When I go to "/tags/bar.html" + Then I should see "Paginate: true" + Then I should see "Article Count: 2" + Then I should see "Page Num: 1" + Then I should see "Num Pages: 3" + Then I should see "Per Page: 2" + Then I should see "Page Start: 1" + Then I should see "Page End: 2" + Then I should see "Next Page: '/tags/bar/page/2.html'" + Then I should see "Prev Page: ''" + Then I should see "/2011-02-02-test-article.html" + Then I should see "/2011-02-01-test-article.html" + Then I should not see "/2011-02-05-test-article.html" + Then I should not see "/2011-01-04-test-article.html" + Then I should not see "/2011-01-03-test-article.html" + + Scenario: Custom pager method + Given a fixture app "paginate-app" + And a file named "config.rb" with: + """ + def items_per_page(all_items) + [ + all_items.shift(2), + all_items + ] + end + + articles = resources.select { |r| + matcher = ::Middleman::Util::UriTemplates.uri_template('blog/2011-{remaining}') + ::Middleman::Util::UriTemplates.extract_params(matcher, ::Middleman::Util.normalize_path(r.url)) + } + + articles.sort { |a, b| + b.data.date <=> a.data.date + }.per_page(method(:items_per_page).to_proc).each do |items, num, meta, is_last| + page_path = num == 1 ? '/2011/index.html' : "/2011/page/#{num}.html" + + prev_page = case num + when 1 + nil + when 2 + '/2011/index.html' + when 3 + "/2011/page/#{num-1}.html" + end + + next_page = is_last ? nil : "/2011/page/#{num+1}.html" + + proxy page_path, "/archive/2011/index.html", locals: { + items: items, + pagination: meta, + prev_page: prev_page, + next_page: next_page + } + end + """ + And the Server is running + When I go to "/2011/index.html" + Then I should see "Paginate: true" + Then I should see "Article Count: 2" + Then I should see "Page Num: 1" + Then I should see "Num Pages: 2" + Then I should see "Per Page: 2" + Then I should see "Page Start: 1" + Then I should see "Page End: 2" + Then I should see "Next Page: '/2011/page/2.html'" + Then I should see "Prev Page: ''" + Then I should not see "/blog/2011-01-01-test-article.html" + Then I should not see "/blog/2011-01-02-test-article.html" + Then I should not see "/blog/2011-01-03-test-article.html" + Then I should not see "/blog/2011-01-04-test-article.html" + Then I should not see "/blog/2011-01-05-test-article.html" + Then I should see "/blog/2011-02-01-test-article.html" + Then I should see "/blog/2011-02-02-test-article.html" + + When I go to "/2011/page/2.html" + Then I should see "Article Count: 5" + Then I should see "Page Num: 2" + Then I should see "Page Start: 3" + Then I should see "Page End: 7" + Then I should see "Next Page: ''" + Then I should see "Prev Page: '/2011/'" + Then I should see "/2011-01-01-test-article.html" + Then I should see "/2011-01-02-test-article.html" + Then I should see "/2011-01-03-test-article.html" + Then I should see "/2011-01-04-test-article.html" + Then I should see "/2011-01-05-test-article.html" + Then I should not see "/2011-02-01-test-article.html" + Then I should not see "/2011-02-02-test-article.html" diff --git a/middleman-core/features/partials.feature b/middleman-core/features/partials.feature index 965215a9..8a0154c2 100644 --- a/middleman-core/features/partials.feature +++ b/middleman-core/features/partials.feature @@ -5,30 +5,30 @@ Feature: Provide Sane Defaults for Partial Behavior When I go to "/index.html" Then I should see "Header" And I should see "Footer" - + Scenario: Finds shared partials relative to the root (sub) Given the Server is running at "partials-app" When I go to "/sub/index.html" Then I should see "Header" And I should see "Footer" - Scenario: Finds shared partials without _ prefix + Scenario: Flags error when partial is not found Given the Server is running at "partials-app" - When I go to "/using_snippet.html" - Then I should see "Snippet" - + When I go to "/index_missing.html" + Then I should see "Error: Could not locate partial" + Scenario: Prefers partials of the same engine type Given the Server is running at "partials-app" When I go to "/index.html" Then I should see "ERb Main" - + Scenario: Prefers partials of the same engine type Given the Server is running at "partials-app" When I go to "/second.html" Then I should see "Str Main" And I should see "Header" And I should see "Footer" - + Scenario: Finds partial relative to template Given the Server is running at "partials-app" When I go to "/sub/index.html" @@ -38,7 +38,7 @@ Feature: Provide Sane Defaults for Partial Behavior Given the Server is running at "partials-app" When I go to "/locals.html" Then I should see "Local var is bar" - + Scenario: Partial and Layout use different engines Given the Server is running at "different-engine-partial" When I go to "/index.html" @@ -55,3 +55,10 @@ Feature: Provide Sane Defaults for Partial Behavior Then I should see "File Not Found" When I go to "/_code_snippet.html" Then I should see "File Not Found" + +Scenario: Works with blocks + Given the Server is running at "partials-app" + When I go to "/block.html" + Then I should see "Start" + And I should see "Contents" + And I should see "End" diff --git a/middleman-core/features/partials_dir.feature b/middleman-core/features/partials_dir.feature deleted file mode 100644 index 8648c8e2..00000000 --- a/middleman-core/features/partials_dir.feature +++ /dev/null @@ -1,30 +0,0 @@ -Feature: Partials dir - Scenario: Find partials in a custom partials dir - Given a fixture app "partials-dir-app" - And a file named "config.rb" with: - """ - set :partials_dir, 'partials' - """ - And the Server is running - When I go to "/index.html" - Then I should see "contents of the partial" - - Scenario: Find partials in a nested custom partials dir - Given a fixture app "partials-dir-app" - And a file named "config.rb" with: - """ - set :partials_dir, 'nested/partials' - """ - And the Server is running - When I go to "/index.html" - Then I should see "contents of the nested partial" - - Scenario: Find partials in the default partials dir - Given a fixture app "default-partials-dir-app" - And a file named "config.rb" with: - """ - """ - And the Server is running - When I go to "/index.html" - Then I should see "contents of the partial" - diff --git a/middleman-core/features/proxy_pages.feature b/middleman-core/features/proxy_pages.feature index 522f1eb8..4a22727c 100644 --- a/middleman-core/features/proxy_pages.feature +++ b/middleman-core/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" diff --git a/middleman-core/features/queryable.feature b/middleman-core/features/queryable.feature deleted file mode 100644 index 1382db3f..00000000 --- a/middleman-core/features/queryable.feature +++ /dev/null @@ -1,35 +0,0 @@ -Feature: Queryable Selector - Scenario: Basic Selector Tests - Then should initialize with an attribute and an operator - Then should raise an exception if the operator is not supported - Scenario: Using offset and limit - Given the Server is running at "queryable-app" - Then should limit the documents to the number specified - Then should offset the documents by the number specified - Then should support offset and limit at the same time - Then should not freak out about an offset higher than the document count - Scenario: Using where queries with an equal operator - Given the Server is running at "queryable-app" - Then should return the right documents - Then should be chainable - Then should not be confused by attributes not present in all documents - Scenario: Using where queries with a complex operator - Given the Server is running at "queryable-app" - Then with a gt operator should return the right documents - Then with a gte operator should return the right documents - Then with an in operator should return the right documents - Then with an lt operator should return the right documents - Then with an lte operator should return the right documents - Then with an include operator include should return the right documents - Then with mixed operators should return the right documents - Then using multiple constrains in one where should return the right documents - Scenario: Sorting documents - Given the Server is running at "queryable-app" - Then should support ordering by attribute ascending - Then should support ordering by attribute descending - Then should order by attribute ascending by default - Then should exclude documents that do not own the attribute - Scenario: Passing queries around - Given a simple 'where' query - When I chain a where clause onto that query - Then the original query should remain unchanged diff --git a/middleman-core/features/redirects.feature b/middleman-core/features/redirects.feature index f01e9aac..c1549128 100644 --- a/middleman-core/features/redirects.feature +++ b/middleman-core/features/redirects.feature @@ -4,7 +4,7 @@ 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" @@ -15,7 +15,7 @@ Feature: Meta redirects 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 +27,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 +39,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 +52,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 """ diff --git a/middleman-core/features/relative_assets.feature b/middleman-core/features/relative_assets.feature index e0c6b16f..ba131396 100644 --- a/middleman-core/features/relative_assets.feature +++ b/middleman-core/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,7 +15,7 @@ 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" @@ -33,7 +33,19 @@ Feature: Relative Assets 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 "../" + When I go to "/stylesheets/fonts.css" + Then I should see 'url(../fonts/roboto/roboto-regular-webfont.eot' + And I should see 'url(../fonts/roboto/roboto-regular-webfont.woff' + And I should see 'url(../fonts/roboto/roboto-regular-webfont.ttf' + And I should see 'url(../fonts/roboto/roboto-regular-webfont.svg' + When I go to "/stylesheets/fonts2.css" + Then I should see 'url(../fonts/roboto/roboto-regular-webfont.eot' + And I should see 'url(../fonts/roboto/roboto-regular-webfont.woff' + And I should see 'url(../fonts/roboto/roboto-regular-webfont.ttf' + And I should see 'url(../fonts/roboto/roboto-regular-webfont.svg' Scenario: Building css with the feature enabled Given a fixture app "relative-assets-app" @@ -43,7 +55,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" @@ -56,60 +69,30 @@ Feature: Relative Assets When I cd to "build" Then the file "relative_image/index.html" should contain "../stylesheets/relative_assets.css" - Scenario: Rendering html with the feature enabled + Scenario: Rendering html with the feature enabled (overrides relative option on helpers) 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 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 +102,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" @@ -144,7 +120,7 @@ Feature: Relative Assets """ And the Server is running at "relative-assets-app" When I go to "/sub/image_tag.html" - Then I should see ''
+ Then I should see ''
\ No newline at end of file
+ Then I should see ''
+
+ Scenario: URLs are not rewritten for rewrite ignored paths
+ Given a fixture app "relative-assets-app"
+ And a file named "config.rb" with:
+ """
+ activate :relative_assets, rewrite_ignore: [
+ '/stylesheets/fonts.css',
+ ]
+ """
+ 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'
+ When I go to "/stylesheets/fonts.css"
+ Then I should see 'url(/fonts/roboto/roboto-regular-webfont.eot'
diff --git a/middleman-core/features/relative_assets_helpers_only.feature b/middleman-core/features/relative_assets_helpers_only.feature
new file mode 100644
index 00000000..194c8b37
--- /dev/null
+++ b/middleman-core/features/relative_assets_helpers_only.feature
@@ -0,0 +1,123 @@
+Feature: Relative Assets (Helpers Only)
+
+ Scenario: Rendering css with the feature enabled
+ Given a fixture app "relative-assets-app"
+ And a file named "config.rb" with:
+ """
+ activate :relative_assets, helpers_only: true
+ """
+ And a file named "source/stylesheets/relative_assets.css.sass.erb" with:
+ """
+ h1
+ background: url("<%= asset_url('images/blank.gif') %>")
+ h2
+ background: url("<%= asset_url('/images/blank2.gif') %>")
+ """
+ And a file named "source/javascripts/application.js.erb" with:
+ """
+ function foo() {
+ var img = document.createElement('img');
+ img.src = '<%= asset_url("images/100px.jpg") %>';
+ var body = document.getElementsByTagName('body')[0];
+ body.insertBefore(img, body.firstChild);
+ }
+
+ window.onload = foo;
+ """
+ And a file named "source/stylesheets/fonts3.css.erb" with:
+ """
+ @font-face {
+ font-family: 'Roboto2';
+ src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot") %>);
+ src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot?#iefix") %>) format('embedded-opentype'),
+ url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.woff") %>) format('woff'),
+ url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.ttf") %>) format('truetype'),
+ url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.svg#robotoregular") %>) format('svg');
+ font-weight: normal;
+ font-style: normal;
+ }
+ """
+ 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'
+ And I should see 'url("../images/blank2.gif'
+ When I go to "/javascripts/application.js"
+ Then I should not see "../"
+ When I go to "/stylesheets/fonts3.css"
+ Then I should see 'url(../fonts/roboto/roboto-regular-webfont.eot'
+ And I should see 'url(../fonts/roboto/roboto-regular-webfont.woff'
+ And I should see 'url(../fonts/roboto/roboto-regular-webfont.ttf'
+ And I should see 'url(../fonts/roboto/roboto-regular-webfont.svg'
+
+ Scenario: Relative css reference with directory indexes
+ Given a fixture app "relative-assets-app"
+ And a file named "config.rb" with:
+ """
+ activate :directory_indexes
+ activate :relative_assets, helpers_only: true
+ """
+ And the Server is running at "relative-assets-app"
+ When I go to "/relative_image/index.html"
+ Then I should see "../stylesheets/relative_assets.css"
+
+ Scenario: Relative assets via image_tag
+ Given a fixture app "relative-assets-app"
+ And a file named "config.rb" with:
+ """
+ activate :relative_assets, helpers_only: true
+ """
+ And a file named "source/sub/image_tag.html.erb" with:
+ """
+ <%= image_tag '/img/blank.gif' %>
+ """
+ And the Server is running at "relative-assets-app"
+ When I go to "/sub/image_tag.html"
+ Then I should see '
+ """
+ And the Server is running at "relative-assets-app"
+ When I go to "/sub/image_tag.html"
+ Then I should see ''
+
+ Scenario: URLs are not rewritten for rewrite ignored paths
+ Given a fixture app "relative-assets-app"
+ And a file named "config.rb" with:
+ """
+ activate :relative_assets, rewrite_ignore: [
+ '/stylesheets/fonts3.css',
+ ], helpers_only: true
+ """
+ And a file named "source/stylesheets/relative_assets.css.sass.erb" with:
+ """
+ h1
+ background: url("<%= asset_url('images/blank.gif') %>")
+ h2
+ background: url("<%= asset_url('/images/blank2.gif') %>")
+ """
+ And a file named "source/stylesheets/fonts3.css.erb" with:
+ """
+ @font-face {
+ font-family: 'Roboto2';
+ src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot") %>);
+ src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot?#iefix") %>) format('embedded-opentype'),
+ url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.woff") %>) format('woff'),
+ url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.ttf") %>) format('truetype'),
+ url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.svg#robotoregular") %>) format('svg');
+ font-weight: normal;
+ font-style: normal;
+ }
+ """
+ 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'
+ When I go to "/stylesheets/fonts3.css"
+ Then I should see 'url(/fonts/roboto/roboto-regular-webfont.eot'
diff --git a/middleman-core/features/request_params.feature b/middleman-core/features/request_params.feature
deleted file mode 100644
index 968d0bfc..00000000
--- a/middleman-core/features/request_params.feature
+++ /dev/null
@@ -1,6 +0,0 @@
-Feature: Support request parameters
- Scenario: Use request params in a template
- Given the Server is running at "request-app"
- When I go to "/index.html?say=Hello+World"
- Then I should see "Quote Hello World"
- Then I should see "Symbol Hello World"
diff --git a/middleman-core/features/sass_in_slim.feature b/middleman-core/features/sass_in_slim.feature
new file mode 100644
index 00000000..d04055e4
--- /dev/null
+++ b/middleman-core/features/sass_in_slim.feature
@@ -0,0 +1,40 @@
+Feature: Sass/SCSS support in Slim
+ In order to test support of the Slim sass and scss filters
+
+ Scenario: Sass filter in Slim works
+ Given a fixture app "sass-in-slim-app"
+ And a file named "config.rb" with:
+ """
+ activate :directory_indexes
+ """
+ And a file named "source/sass_filter.html.slim" with:
+ """
+ sass:
+ .sass
+ margin: 0
+ """
+ Given the Server is running at "sass-in-slim-app"
+ When I go to "/sass_filter/"
+ Then I should see "text/css"
+ Then I should see ".sass"
+ Then I should see "margin:0"
+
+
+ Scenario: SCSS filter in Slim works
+ Given a fixture app "sass-in-slim-app"
+ And a file named "config.rb" with:
+ """
+ activate :directory_indexes
+ """
+ And a file named "source/scss_filter.html.slim" with:
+ """
+ scss:
+ .scss {
+ margin: 0;
+ }
+ """
+ Given the Server is running at "sass-in-slim-app"
+ When I go to "/scss_filter/"
+ Then I should see "text/css"
+ Then I should see ".scss"
+ Then I should see "margin:0"
diff --git a/middleman-core/features/slim.feature b/middleman-core/features/slim.feature
index 187600a1..031120f3 100644
--- a/middleman-core/features/slim.feature
+++ b/middleman-core/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"
\ No newline at end of file
+ Then I should see "Error:"
diff --git a/middleman-core/features/static_server.feature b/middleman-core/features/static_server.feature
deleted file mode 100644
index 569b4cd1..00000000
--- a/middleman-core/features/static_server.feature
+++ /dev/null
@@ -1,6 +0,0 @@
-Feature: Middleman should serve plain directories without config
-
- Scenario: Preview a folder of static pages
- Given the Server is running at "plain-app"
- When I go to "/index.html"
- Then I should see "I am index"
\ No newline at end of file
diff --git a/middleman-core/features/step_definitions/page_layout_steps.rb b/middleman-core/features/step_definitions/page_layout_steps.rb
deleted file mode 100644
index 9456d4cf..00000000
--- a/middleman-core/features/step_definitions/page_layout_steps.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-Given /^page "([^\"]*)" has layout "([^\"]*)"$/ do |url, layout|
- @initialize_commands ||= []
- @initialize_commands << lambda {
- page(url, :layout => layout.to_sym)
- }
-end
-
-Given /^"([^\"]*)" with_layout block has layout "([^\"]*)"$/ do |url, layout|
- @initialize_commands ||= []
- @initialize_commands << lambda {
- with_layout(layout.to_sym) do
- page(url)
- end
- }
-end
diff --git a/middleman-core/features/step_definitions/queryable_steps.rb b/middleman-core/features/step_definitions/queryable_steps.rb
deleted file mode 100644
index 995c3d33..00000000
--- a/middleman-core/features/step_definitions/queryable_steps.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-Given /^a simple 'where' query$/ do
- @query = Middleman::Sitemap::Queryable::Query.new({}).where(:foo => 'bar')
-end
-
-When /^I chain a where clause onto that query$/ do
- @new_query = @query.where(:baz => 'foo')
-end
-
-Then /^the original query should remain unchanged$/ do
- @query.opts({}).should_not eql @new_query.opts({})
-end
-
-Then /^should initialize with an attribute and an operator$/ do
- selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :author, :operator => 'equal'
- :author.should == selector.attribute
- 'equal'.should == selector.operator
-end
-
-Then /^should raise an exception if the operator is not supported$/ do
- expect {
- selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :author, :operator => 'zomg'
- }.to raise_error(::Middleman::Sitemap::Queryable::OperatorNotSupportedError)
-end
-
-Then /^should limit the documents to the number specified$/ do
- @server_inst.sitemap.order_by(:id).limit(2).all.map { |r| r.raw_data[:id] }.sort.should == [1,2].sort
-end
-
-Then /^should offset the documents by the number specified$/ do
- @server_inst.sitemap.order_by(:id).offset(2).all.map { |r| r.raw_data[:id] }.sort.should == [3,4,5].sort
-end
-
-Then /^should support offset and limit at the same time$/ do
- @server_inst.sitemap.order_by(:id).offset(1).limit(2).all.map { |r| r.raw_data[:id] }.sort.should == [2,3].sort
-end
-
-Then /^should not freak out about an offset higher than the document count$/ do
- @server_inst.sitemap.order_by(:id).offset(5).all.should == []
-end
-
-Then /^should return the right documents$/ do
- documents = @server_inst.sitemap.resources.select { |r| !r.raw_data.empty? }
- document_1 = documents[0]
- document_2 = documents[1]
-
- found_document = @server_inst.sitemap.where(:title => document_1.raw_data[:title]).first
- document_1.should == found_document
-
- found_document = @server_inst.sitemap.where(:title => document_2.raw_data[:title]).first
- document_2.should == found_document
-end
-
-Then /^should be chainable$/ do
- documents = @server_inst.sitemap.resources.select { |r| !r.raw_data.empty? }
- document_1 = documents[0]
-
- document_proxy = @server_inst.sitemap.where(:title => document_1.raw_data[:title])
- document_proxy.where(:id => document_1.raw_data[:id])
- document_1.should == document_proxy.first
-end
-
-Then /^should not be confused by attributes not present in all documents$/ do
- result = @server_inst.sitemap.where(:seldom_attribute => 'is seldom').all
- result.map { |r| r.raw_data[:id] }.should == [4]
-end
-
-Then /^with a gt operator should return the right documents$/ do
- selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'gt'
- found_documents = @server_inst.sitemap.where(selector => 2).all
- found_documents.map { |r| r.raw_data[:id] }.sort.should == [5,3,4].sort
-end
-
-Then /^with a gte operator should return the right documents$/ do
- selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'gte'
- found_documents = @server_inst.sitemap.where(selector => 2).all
- found_documents.map { |r| r.raw_data[:id] }.sort.should == [2,5,3,4].sort
-end
-
-Then /^with an in operator should return the right documents$/ do
- selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'in'
- found_documents = @server_inst.sitemap.where(selector => [2,3]).all
- found_documents.map { |r| r.raw_data[:id] }.sort.should == [2,3].sort
-end
-
-Then /^with an lt operator should return the right documents$/ do
- selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'lt'
- found_documents = @server_inst.sitemap.where(selector => 2).all
- found_documents.map { |r| r.raw_data[:id] }.should == [1]
-end
-
-Then /^with an lte operator should return the right documents$/ do
- selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'lte'
- found_documents = @server_inst.sitemap.where(selector => 2).all
- found_documents.map { |r| r.raw_data[:id] }.sort.should == [1,2].sort
-end
-
-Then /^with an include operator include should return the right documents$/ do
- selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :tags, :operator => 'include'
- found_documents = @server_inst.sitemap.where(selector => 'ruby').all
- found_documents.map { |r| r.raw_data[:id] }.sort.should == [1,2].sort
-end
-
-Then /^with mixed operators should return the right documents$/ do
- in_selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'in'
- gt_selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'gt'
- documents_proxy = @server_inst.sitemap.where(in_selector => [2,3])
- found_documents = documents_proxy.where(gt_selector => 2).all
- found_documents.map { |r| r.raw_data[:id] }.should == [3]
-end
-
-Then /^using multiple constrains in one where should return the right documents$/ do
- selector = ::Middleman::Sitemap::Queryable::Selector.new :attribute => :id, :operator => 'lte'
- found_documents = @server_inst.sitemap.where(selector => 2, :status => :published).all
- found_documents.map { |r| r.raw_data[:id] }.sort.should == [1,2].sort
-end
-
-Then /^should support ordering by attribute ascending$/ do
- found_documents = @server_inst.sitemap.order_by(:title => :asc).all
- found_documents.map { |r| r.raw_data[:id] }.should == [2,3,1,5,4]
-end
-
-Then /^should support ordering by attribute descending$/ do
- found_documents = @server_inst.sitemap.order_by(:title => :desc).all
- found_documents.map { |r| r.raw_data[:id] }.should == [4,5,1,3,2]
-end
-
-Then /^should order by attribute ascending by default$/ do
- found_documents = @server_inst.sitemap.order_by(:title).all
- found_documents.map { |r| r.raw_data[:id] }.should == [2,3,1,5,4]
-end
-
-Then /^should exclude documents that do not own the attribute$/ do
- found_documents = @server_inst.sitemap.order_by(:status).all
- found_documents.map { |r| r.raw_data[:id] }.to_set.should == [1,2].to_set
-end
diff --git a/middleman-core/features/stylus.feature b/middleman-core/features/stylus.feature
index df17962b..15b44f18 100644
--- a/middleman-core/features/stylus.feature
+++ b/middleman-core/features/stylus.feature
@@ -1,4 +1,3 @@
-@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"
diff --git a/middleman-core/features/support/env.rb b/middleman-core/features/support/env.rb
index 8213b7c7..77cfbb06 100644
--- a/middleman-core/features/support/env.rb
+++ b/middleman-core/features/support/env.rb
@@ -1,15 +1,19 @@
ENV["TEST"] = "true"
-ENV["AUTOLOAD_SPROCKETS"] = "false"
+
+require 'sassc'
require 'simplecov'
SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..'))
-require 'capybara/poltergeist'
+require 'phantomjs/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')
diff --git a/middleman-core/features/template-key-collision.feature b/middleman-core/features/template-key-collision.feature
new file mode 100644
index 00000000..9e530dc1
--- /dev/null
+++ b/middleman-core/features/template-key-collision.feature
@@ -0,0 +1,26 @@
+Feature: Don't allow template locals to overwrite template helpers
+
+ Scenario: Normal Template
+ Given an empty app
+ And a file named "config.rb" with:
+ """
+ class TestExt < ::Middleman::Extension
+ expose_to_template foo: :foo
+
+ def foo
+ "bar"
+ end
+ end
+
+ ::Middleman::Extensions.register :test, TestExt
+
+ activate :test
+
+ page "/index.html", locals: { foo: false }
+ """
+ And a file named "source/index.html.erb" with:
+ """
+ <%= foo %>
+ """
+ Given a built app at "empty_app"
+ Then the exit status should be 1
diff --git a/middleman-core/features/twitter-bootstrap-compile.feature b/middleman-core/features/twitter-bootstrap-compile.feature
deleted file mode 100644
index 04ffc0ce..00000000
--- a/middleman-core/features/twitter-bootstrap-compile.feature
+++ /dev/null
@@ -1,6 +0,0 @@
-@nojava @nowindows
-Feature: Compile a complicated Twitter bootstrap app
-
- Scenario: User drops Twitter Bootstrap source into an app
-
- Given a successfully built app at "twitter-bootstrap-app"
diff --git a/middleman-core/features/v3_extensions.feature b/middleman-core/features/v3_extensions.feature
deleted file mode 100644
index 134dd72f..00000000
--- a/middleman-core/features/v3_extensions.feature
+++ /dev/null
@@ -1,20 +0,0 @@
-Feature: v3 Modular Extension
- Scenario: Registering and overwriting a system config option
- Given a fixture app "large-build-app"
- And a file named "config.rb" with:
- """
- module MyFeature
- class << self
- def registered(app)
- app.set :css_dir, "lib/my/css"
- end
- alias :included :registered
- end
- end
-
- ::Middleman::Extensions.register(:my_feature, MyFeature)
- activate :my_feature
- """
- Given a successfully built app at "large-build-app"
- When I cd to "build"
- Then the file "link_test.html" should contain "lib/my/css/test.css"
\ No newline at end of file
diff --git a/middleman-core/features/working_directory.feature b/middleman-core/features/working_directory.feature
deleted file mode 100644
index 9532e68f..00000000
--- a/middleman-core/features/working_directory.feature
+++ /dev/null
@@ -1,33 +0,0 @@
-Feature: Honour working directory
- Honour the working directory during testing
- In order to support helpers which work with the current directories
-
- Scenario: Set working directory for helpers in tests
- Given a fixture app "empty-app"
- And a file named "source/index.erb" with:
- """
- <%= Dir.getwd %>
- """
- And the Server is running
- When I go to "/index.html"
- Then I should see:
- """
- aruba
- """
-
- Scenario: Set working directory for config.rb in tests
- Given a fixture app "empty-app"
- And a file named "config.rb" with:
- """
- set :my_working_directory, Dir.getwd
- """
- And a file named "source/index.erb" with:
- """
- <%= my_working_directory %>
- """
- And the Server is running
- When I go to "/index.html"
- Then I should see:
- """
- aruba
- """
diff --git a/middleman-core/fixtures/asciidoc-app/source/_include.adoc b/middleman-core/fixtures/asciidoc-app/source/_include.adoc
deleted file mode 100644
index b0cdec38..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/_include.adoc
+++ /dev/null
@@ -1 +0,0 @@
-I'm included content.
diff --git a/middleman-core/fixtures/asciidoc-app/source/code.adoc b/middleman-core/fixtures/asciidoc-app/source/code.adoc
deleted file mode 100644
index e0d6a519..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/code.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-```ruby
-puts "Is this mic on?"
-```
diff --git a/middleman-core/fixtures/asciidoc-app/source/custom-attribute.adoc b/middleman-core/fixtures/asciidoc-app/source/custom-attribute.adoc
deleted file mode 100644
index b4eb729d..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/custom-attribute.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-++++
-{foo}
-++++
diff --git a/middleman-core/fixtures/asciidoc-app/source/gallery.adoc b/middleman-core/fixtures/asciidoc-app/source/gallery.adoc
deleted file mode 100644
index 4a9f37f1..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/gallery.adoc
+++ /dev/null
@@ -1 +0,0 @@
-image::tiger.gif[]
diff --git a/middleman-core/fixtures/asciidoc-app/source/hello-no-layout.adoc b/middleman-core/fixtures/asciidoc-app/source/hello-no-layout.adoc
deleted file mode 100644
index 8156a16f..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/hello-no-layout.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-:page-layout: false
-Hello, AsciiDoc!
diff --git a/middleman-core/fixtures/asciidoc-app/source/hello-with-front-matter.adoc b/middleman-core/fixtures/asciidoc-app/source/hello-with-front-matter.adoc
deleted file mode 100644
index 5e1f91a3..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/hello-with-front-matter.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Page Title
-layout: default
----
-Hello, AsciiDoc!
diff --git a/middleman-core/fixtures/asciidoc-app/source/hello-with-layout.adoc b/middleman-core/fixtures/asciidoc-app/source/hello-with-layout.adoc
deleted file mode 100644
index 763ba8c1..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/hello-with-layout.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-:page-layout: default
-Hello, AsciiDoc!
diff --git a/middleman-core/fixtures/asciidoc-app/source/hello-with-title.adoc b/middleman-core/fixtures/asciidoc-app/source/hello-with-title.adoc
deleted file mode 100644
index e2c7673b..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/hello-with-title.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-= Page Title
-:page-layout: default
-
-Hello, AsciiDoc!
diff --git a/middleman-core/fixtures/asciidoc-app/source/hello.adoc b/middleman-core/fixtures/asciidoc-app/source/hello.adoc
deleted file mode 100755
index 6c1ab072..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/hello.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-Hello, AsciiDoc!
-ifdef::env-middleman[]
-Middleman, I am in you.
-endif::env-middleman[]
diff --git a/middleman-core/fixtures/asciidoc-app/source/layouts/default.erb b/middleman-core/fixtures/asciidoc-app/source/layouts/default.erb
deleted file mode 100644
index 6ae4c924..00000000
--- a/middleman-core/fixtures/asciidoc-app/source/layouts/default.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-Image url:
+<%= image_tag('100px.jpg?test') %>
+<%= image_tag('100px.jpg?#test') %>
+<%= image_tag('100px.jpg#test') %>
Ignored path:
diff --git a/middleman-core/fixtures/asset-hash-app/source/layout.erb b/middleman-core/fixtures/asset-hash-app/source/layout.erb index a21259a3..3a1079a7 100644 --- a/middleman-core/fixtures/asset-hash-app/source/layout.erb +++ b/middleman-core/fixtures/asset-hash-app/source/layout.erb @@ -3,16 +3,16 @@ - <%= stylesheet_link_tag "site" %> + <%= stylesheet_link_tag "site", "fragment" %> <%= javascript_include_tag "application" %> <%= yield_content :head %> - +
<%= yield %>
-
+