From 7c266d9e852dba095fe0bb9aedc3a0ab2a37bb70 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Sat, 23 Jul 2011 22:53:17 -0700 Subject: [PATCH] prep rc release --- features/asset_host.feature | 2 ++ features/automatic_image_sizes.feature | 2 ++ features/cache_buster.feature | 4 ++++ features/minify_css.feature | 2 ++ features/minify_javascript.feature | 3 +++ features/page_alias_and_layouts.feature | 5 +++++ features/relative_assets.feature | 2 +- features/tiny_src.feature | 2 ++ lib/middleman/version.rb | 2 +- 9 files changed, 22 insertions(+), 2 deletions(-) diff --git a/features/asset_host.feature b/features/asset_host.feature index beb1bc5b..491f9757 100644 --- a/features/asset_host.feature +++ b/features/asset_host.feature @@ -3,10 +3,12 @@ Feature: Alternate between multiple asset hosts Scenario: Rendering css with the feature enabled Given I am using an asset host + And the Server is running When I go to "/stylesheets/asset_host.css" Then I should see "http://assets" Scenario: Rendering html with the feature enabled Given I am using an asset host + And the Server is running When I go to "/asset_host.html" Then I should see "http://assets" \ No newline at end of file diff --git a/features/automatic_image_sizes.feature b/features/automatic_image_sizes.feature index 02c3b6cb..1548e270 100644 --- a/features/automatic_image_sizes.feature +++ b/features/automatic_image_sizes.feature @@ -3,12 +3,14 @@ Feature: Automatically detect and insert image dimensions into tags Scenario: Rendering an image with the feature disabled Given "automatic_image_sizes" feature is "disabled" + And the Server is running When I go to "/auto-image-sizes.html" Then I should not see "width=" And I should not see "height=" Scenario: Rendering an image with the feature enabled Given "automatic_image_sizes" feature is "enabled" + And the Server is running When I go to "/auto-image-sizes.html" Then I should see "width=" And I should see "height=" \ No newline at end of file diff --git a/features/cache_buster.feature b/features/cache_buster.feature index ef62ff16..642abd51 100644 --- a/features/cache_buster.feature +++ b/features/cache_buster.feature @@ -3,20 +3,24 @@ Feature: Generate mtime-based query string for busting browser caches Scenario: Rendering css with the feature disabled Given "cache_buster" feature is "disabled" + And the Server is running When I go to "/stylesheets/relative_assets.css" Then I should not see "?" Scenario: Rendering html with the feature disabled Given "cache_buster" feature is "disabled" + And the Server is running When I go to "/cache-buster.html" Then I should not see "?" Scenario: Rendering css with the feature enabled Given "cache_buster" feature is "enabled" + And the Server is running When I go to "/stylesheets/relative_assets.css" Then I should see "?" Scenario: Rendering html with the feature enabled Given "cache_buster" feature is "enabled" + And the Server is running When I go to "/cache-buster.html" Then I should not see "?" \ No newline at end of file diff --git a/features/minify_css.feature b/features/minify_css.feature index 5fe03599..60028d1d 100644 --- a/features/minify_css.feature +++ b/features/minify_css.feature @@ -8,6 +8,7 @@ Feature: Minify CSS Scenario: Rendering external css with the feature disabled Given "minify_css" feature is "disabled" + And the Server is running When I go to "/stylesheets/site.css" Then I should see "55" lines @@ -18,5 +19,6 @@ Feature: Minify CSS Scenario: Rendering external css with the feature enabled Given "minify_css" feature is "enabled" + And the Server is running When I go to "/stylesheets/site.css" Then I should see "1" lines \ No newline at end of file diff --git a/features/minify_javascript.feature b/features/minify_javascript.feature index a5ff4a59..0c0c5bd0 100644 --- a/features/minify_javascript.feature +++ b/features/minify_javascript.feature @@ -6,15 +6,18 @@ Feature: Minify Javascript Scenario: Rendering inline js with the feature disabled Given "minify_javascript" feature is "disabled" + And the Server is running When I go to "/inline-js.html" Then I should see "10" lines Scenario: Rendering inline js with the feature enabled Given "minify_javascript" feature is "enabled" + And the Server is running When I go to "/inline-js.html" Then I should see "5" lines Scenario: Rendering inline js (coffeescript) with the feature enabled Given "minify_javascript" feature is "enabled" + And the Server is running When I go to "/inline-coffeescript.html" Then I should see "5" lines \ No newline at end of file diff --git a/features/page_alias_and_layouts.feature b/features/page_alias_and_layouts.feature index 28f5e9c3..1d0be362 100644 --- a/features/page_alias_and_layouts.feature +++ b/features/page_alias_and_layouts.feature @@ -3,16 +3,19 @@ Feature: Custom layouts Scenario: Using custom :layout attribute Given page "/custom-layout.html" has layout "custom" + And the Server is running 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" + And the Server is running When I go to "/custom-layout.html" Then I should see "Custom Layout" Scenario: Using custom :layout attribute with folders Given page "/custom-layout-dir/" has layout "custom" + And the Server is running When I go to "/custom-layout-dir" Then I should see "Custom Layout" When I go to "/custom-layout-dir/" @@ -22,6 +25,7 @@ Feature: Custom layouts Scenario: Using custom :layout attribute with folders Given page "/custom-layout-dir" has layout "custom" + And the Server is running When I go to "/custom-layout-dir" Then I should see "Custom Layout" When I go to "/custom-layout-dir/" @@ -31,6 +35,7 @@ Feature: Custom layouts Scenario: Using custom :layout attribute with folders Given page "/custom-layout-dir/index.html" has layout "custom" + And the Server is running When I go to "/custom-layout-dir" Then I should see "Custom Layout" When I go to "/custom-layout-dir/" diff --git a/features/relative_assets.feature b/features/relative_assets.feature index cb732b7e..5902ac2d 100644 --- a/features/relative_assets.feature +++ b/features/relative_assets.feature @@ -6,7 +6,7 @@ Feature: Relative Assets And the Server is running When I go to "/stylesheets/relative_assets.css" Then I should not see "url('../" - And I should see "url('/images/blank.gif" + And I should see "/images/blank.gif" Scenario: Rendering html with the feature disabled Given "relative_assets" feature is "disabled" diff --git a/features/tiny_src.feature b/features/tiny_src.feature index 6d8df909..117f824b 100644 --- a/features/tiny_src.feature +++ b/features/tiny_src.feature @@ -4,10 +4,12 @@ Feature: Tiny Src Scenario: Rendering html with the feature disabled Given "tiny_src" feature is "disabled" + And the Server is running When I go to "/tiny_src.html" Then I should see "http://test.com/image.jpg" Scenario: Rendering html with the feature enabled Given "tiny_src" feature is "enabled" + And the Server is running When I go to "/tiny_src.html" Then I should see "http://i.tinysrc.mobi/http://test.com/image.jpg" \ No newline at end of file diff --git a/lib/middleman/version.rb b/lib/middleman/version.rb index d7eff6a3..cc751893 100644 --- a/lib/middleman/version.rb +++ b/lib/middleman/version.rb @@ -1,3 +1,3 @@ module Middleman - VERSION = "2.0.0.rc8" + VERSION = "2.0.0.rc9" end