From 251a2e0eb3f114049d883a999cbf55a502c8e326 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Tue, 31 Jan 2012 21:30:45 -0800 Subject: [PATCH] add failing tests for compass relative assets --- .../lib/middleman-core/cli/build.rb | 4 ++ .../features/relative_assets.feature | 43 ++++++++++++++++--- .../fixtures/relative-assets-app/config.rb | 1 + .../middleman-more/core_extensions/compass.rb | 16 +++---- .../middleman-more/extensions/cache_buster.rb | 2 +- .../middleman-more/extensions/minify_css.rb | 2 +- .../extensions/minify_javascript.rb | 2 +- .../extensions/relative_assets.rb | 2 +- middleman-more/middleman-more.gemspec | 2 +- 9 files changed, 55 insertions(+), 19 deletions(-) diff --git a/middleman-core/lib/middleman-core/cli/build.rb b/middleman-core/lib/middleman-core/cli/build.rb index 1f28ae5c..fc6913e4 100644 --- a/middleman-core/lib/middleman-core/cli/build.rb +++ b/middleman-core/lib/middleman-core/cli/build.rb @@ -31,6 +31,10 @@ module Middleman::Cli :aliases => "-g", :default => nil, :desc => 'Build a subset of the project' + method_option :verbose, + :type => :boolean, + :default => false, + :desc => 'Print debug messages' # Core build Thor command # @return [void] diff --git a/middleman-more/features/relative_assets.feature b/middleman-more/features/relative_assets.feature index cbf19ef6..ad936a8c 100644 --- a/middleman-more/features/relative_assets.feature +++ b/middleman-more/features/relative_assets.feature @@ -1,12 +1,21 @@ Feature: Relative Assets In order easily switch between relative and absolute paths - Scenario: Rendering css with the feature disabled + Scenario: Previewing css with the feature disabled Given "relative_assets" feature is "disabled" 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 "url('/images/blank.gif')" + + Scenario: Building css with the feature disabled + Given a fixture app "relative-assets-app" + And a file named "config.rb" with: + """ + """ + 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')" Scenario: Rendering html with the feature disabled Given "relative_assets" feature is "disabled" @@ -20,6 +29,16 @@ Feature: Relative Assets When I go to "/stylesheets/relative_assets.css" Then I should see "url('../images/blank.gif" + Scenario: Building css with the feature enabled + Given a fixture app "relative-assets-app" + And a file named "config.rb" with: + """ + 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('../images/blank.gif')" + Scenario: Rendering html with the feature enabled Given "relative_assets" feature is "enabled" And the Server is running at "relative-assets-app" @@ -28,13 +47,24 @@ Feature: Relative Assets And I should see "images/blank.gif" Scenario: Rendering html with a custom images_dir - Given "relative_assets" feature is "enabled" + Given "css" 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" + Then I should see "url('../img/blank.gif')" - Scenario: Rendering css with a custom images_dir + 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" @@ -43,8 +73,9 @@ Feature: Relative Assets 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" \ No newline at end of file + Then I should see "url('../fonts/StMarie-Thin.otf" \ No newline at end of file diff --git a/middleman-more/fixtures/relative-assets-app/config.rb b/middleman-more/fixtures/relative-assets-app/config.rb index e69de29b..b4efaffc 100644 --- a/middleman-more/fixtures/relative-assets-app/config.rb +++ b/middleman-more/fixtures/relative-assets-app/config.rb @@ -0,0 +1 @@ +activate :relative_assets \ No newline at end of file diff --git a/middleman-more/lib/middleman-more/core_extensions/compass.rb b/middleman-more/lib/middleman-more/core_extensions/compass.rb index 55215075..ab251aef 100644 --- a/middleman-more/lib/middleman-more/core_extensions/compass.rb +++ b/middleman-more/lib/middleman-more/core_extensions/compass.rb @@ -58,14 +58,14 @@ module Middleman::CoreExtensions::Compass end # Change paths when in build mode. Required for relative paths - configure :build do - ::Compass.configuration do |config| - config.environment = :production - config.css_dir = File.join(build_dir, css_dir) - config.images_dir = File.join(build_dir, images_dir) - config.fonts_dir = File.join(build_dir, fonts_dir) - end - end + # configure :build do + # ::Compass.configuration do |config| + # config.environment = :production + # config.css_dir = File.join(build_dir, css_dir) + # config.images_dir = File.join(build_dir, images_dir) + # config.fonts_dir = File.join(build_dir, fonts_dir) + # end + # end run_hook :compass_config, ::Compass.configuration run_hook :after_compass_config diff --git a/middleman-more/lib/middleman-more/extensions/cache_buster.rb b/middleman-more/lib/middleman-more/extensions/cache_buster.rb index d1d595f4..647406fe 100755 --- a/middleman-more/lib/middleman-more/extensions/cache_buster.rb +++ b/middleman-more/lib/middleman-more/extensions/cache_buster.rb @@ -70,5 +70,5 @@ module Middleman::Extensions end # Register the extension - register :cache_buster, CacheBuster + # register :cache_buster, CacheBuster end \ No newline at end of file diff --git a/middleman-more/lib/middleman-more/extensions/minify_css.rb b/middleman-more/lib/middleman-more/extensions/minify_css.rb index a9fa6680..a7a8c0b9 100644 --- a/middleman-more/lib/middleman-more/extensions/minify_css.rb +++ b/middleman-more/lib/middleman-more/extensions/minify_css.rb @@ -22,5 +22,5 @@ module Middleman::Extensions end # Register extension - register :minify_css, MinifyCss + # register :minify_css, MinifyCss end \ No newline at end of file diff --git a/middleman-more/lib/middleman-more/extensions/minify_javascript.rb b/middleman-more/lib/middleman-more/extensions/minify_javascript.rb index e6df04ab..390e60b3 100755 --- a/middleman-more/lib/middleman-more/extensions/minify_javascript.rb +++ b/middleman-more/lib/middleman-more/extensions/minify_javascript.rb @@ -73,5 +73,5 @@ module Middleman::Extensions end # Register extension - register :minify_javascript, MinifyJavascript + # register :minify_javascript, MinifyJavascript end \ No newline at end of file diff --git a/middleman-more/lib/middleman-more/extensions/relative_assets.rb b/middleman-more/lib/middleman-more/extensions/relative_assets.rb index 56695efb..4c779ff9 100755 --- a/middleman-more/lib/middleman-more/extensions/relative_assets.rb +++ b/middleman-more/lib/middleman-more/extensions/relative_assets.rb @@ -58,5 +58,5 @@ module Middleman::Extensions end # Register extension - register :relative_assets, RelativeAssets + # register :relative_assets, RelativeAssets end \ No newline at end of file diff --git a/middleman-more/middleman-more.gemspec b/middleman-more/middleman-more.gemspec index 44c2b138..29ca0f52 100644 --- a/middleman-more/middleman-more.gemspec +++ b/middleman-more/middleman-more.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |s| s.add_dependency("uglifier", ["~> 1.2.0"]) s.add_dependency("haml", ["~> 3.1.0"]) s.add_dependency("sass", ["~> 3.1.7"]) - s.add_dependency("compass", ["~> 0.11.3"]) + s.add_dependency("compass", ["0.12.rc.0"]) s.add_dependency("coffee-script", ["~> 2.2.0"]) s.add_dependency("execjs", ["~> 1.2.7"]) s.add_dependency("sprockets", ["~> 2.1.0"])