From e0fce3386cf42541b10244376eb415a51fec7999 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Tue, 1 Jun 2010 08:50:44 -0700 Subject: [PATCH 1/2] [Tests] Don't rely on file timestamps for test fixtures. --- test/fixtures/stylesheets/blueprint/config.rb | 4 ++++ .../stylesheets/blueprint/css/screen.css | 2 +- .../blueprint/css/single-imports/debug.css | 2 +- .../css/single-imports/link-icons.css | 18 +++++++++--------- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/test/fixtures/stylesheets/blueprint/config.rb b/test/fixtures/stylesheets/blueprint/config.rb index 73f448b9..54b306d6 100644 --- a/test/fixtures/stylesheets/blueprint/config.rb +++ b/test/fixtures/stylesheets/blueprint/config.rb @@ -8,3 +8,7 @@ line_comments = false # To enable relative image paths using the images_url() function: # http_images_path = :relative http_images_path = "/images" + +asset_cache_buster do |path, file| + "busted=true" +end diff --git a/test/fixtures/stylesheets/blueprint/css/screen.css b/test/fixtures/stylesheets/blueprint/css/screen.css index fa4dfbbe..365ced83 100644 --- a/test/fixtures/stylesheets/blueprint/css/screen.css +++ b/test/fixtures/stylesheets/blueprint/css/screen.css @@ -669,7 +669,7 @@ input.span-24, textarea.span-24, select.span-24 { margin-bottom: 1.5em; } .showgrid { - background: url('/images/grid.png?1275242906'); } + background: url('/images/grid.png?busted=true'); } .error { padding: 0.8em; diff --git a/test/fixtures/stylesheets/blueprint/css/single-imports/debug.css b/test/fixtures/stylesheets/blueprint/css/single-imports/debug.css index c5369703..9b1b4040 100644 --- a/test/fixtures/stylesheets/blueprint/css/single-imports/debug.css +++ b/test/fixtures/stylesheets/blueprint/css/single-imports/debug.css @@ -1,2 +1,2 @@ .showgrid { - background: url('/images/grid.png?1275242906'); } + background: url('/images/grid.png?busted=true'); } diff --git a/test/fixtures/stylesheets/blueprint/css/single-imports/link-icons.css b/test/fixtures/stylesheets/blueprint/css/single-imports/link-icons.css index 0ee30bbd..65966eed 100644 --- a/test/fixtures/stylesheets/blueprint/css/single-imports/link-icons.css +++ b/test/fixtures/stylesheets/blueprint/css/single-imports/link-icons.css @@ -12,22 +12,22 @@ body a[href^="aim:"] { background-repeat: no-repeat; background-position: right center; } body a[href^="http:"] { - background-image: url('/images/link_icons/external.png?1275377962'); } + background-image: url('/images/link_icons/external.png?busted=true'); } body a[href^="mailto:"] { - background-image: url('/images/link_icons/email.png?1275377962'); } + background-image: url('/images/link_icons/email.png?busted=true'); } body a[href^="http:"]:visited { - background-image: url('/images/link_icons/visited.png?1275377962'); } + background-image: url('/images/link_icons/visited.png?busted=true'); } body a[href$=".pdf"] { - background-image: url('/images/link_icons/pdf.png?1275377962'); } + background-image: url('/images/link_icons/pdf.png?busted=true'); } body a[href$=".doc"] { - background-image: url('/images/link_icons/doc.png?1275377962'); } + background-image: url('/images/link_icons/doc.png?busted=true'); } body a[href$=".xls"] { - background-image: url('/images/link_icons/xls.png?1275377962'); } + background-image: url('/images/link_icons/xls.png?busted=true'); } body a[href$=".rss"], body a[href$=".rdf"] { - background-image: url('/images/link_icons/feed.png?1275377962'); } + background-image: url('/images/link_icons/feed.png?busted=true'); } body a[href^="aim:"] { - background-image: url('/images/link_icons/im.png?1275377962'); } + background-image: url('/images/link_icons/im.png?busted=true'); } body a.noicon { background: transparent none !important; padding: 0 !important; @@ -37,4 +37,4 @@ body a#this-is-a-pdf-link { margin: -2px 0; background-repeat: no-repeat; background-position: right center; - background-image: url('/images/link_icons/pdf.png?1275377962'); } + background-image: url('/images/link_icons/pdf.png?busted=true'); } From 7350e7d6e0895e4f09f5935f9fcd12df1d070e5a Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Tue, 1 Jun 2010 08:51:29 -0700 Subject: [PATCH 2/2] [Tests] Add a test case for the blueprint-scaffolding-body mixin. --- .../stylesheets/blueprint/css/single-imports/scaffolding.css | 3 +++ .../blueprint/sass/single-imports/scaffolding.scss | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/test/fixtures/stylesheets/blueprint/css/single-imports/scaffolding.css b/test/fixtures/stylesheets/blueprint/css/single-imports/scaffolding.css index a76c4717..5f947943 100644 --- a/test/fixtures/stylesheets/blueprint/css/single-imports/scaffolding.css +++ b/test/fixtures/stylesheets/blueprint/css/single-imports/scaffolding.css @@ -40,3 +40,6 @@ form.inline { line-height: 3; } form.inline p { margin-bottom: 0; } + +body { + margin: 1.5em 0; } \ No newline at end of file diff --git a/test/fixtures/stylesheets/blueprint/sass/single-imports/scaffolding.scss b/test/fixtures/stylesheets/blueprint/sass/single-imports/scaffolding.scss index ba3ecad7..4be5d95c 100644 --- a/test/fixtures/stylesheets/blueprint/sass/single-imports/scaffolding.scss +++ b/test/fixtures/stylesheets/blueprint/sass/single-imports/scaffolding.scss @@ -1,3 +1,5 @@ @import "blueprint/scaffolding"; -@include blueprint-scaffolding; \ No newline at end of file +@include blueprint-scaffolding; + +body { @include blueprint-scaffolding-body; }