Skip to content

Commit

Permalink
Updated tests for new Sass string handling
Browse files Browse the repository at this point in the history
Sass has changed the way strings get rendered, breaking some tests. All the values are still correct, so we're still good to go.
  • Loading branch information
Snugug committed Aug 5, 2014
1 parent 214e97f commit a8aaa22
Show file tree
Hide file tree
Showing 11 changed files with 432 additions and 432 deletions.
4 changes: 2 additions & 2 deletions tests/controls/10_double_string.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Double string feature (i.e. string: string)
* $aspect-ratio : "min-aspect-ratio" "300/250";
* $device-aspect-ratio : "max-device-aspect-ratio" "320/480";
* $aspect-ratio : min-aspect-ratio 300/250;
* $device-aspect-ratio : max-device-aspect-ratio 320/480;
*/
@media (min-aspect-ratio: 300 / 250) {
.aspect-ratio {
Expand Down
4 changes: 2 additions & 2 deletions tests/controls/12_breakpoint_resolutions.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Resolution queries, device pixel ratio and standard resolution
* $device-pixel-ratio: "resolution" 2dppx
* $resolution: "min-resolution" 192dpi
* $device-pixel-ratio: resolution 2dppx
* $resolution: min-resolution 192dpi
*/
@media (resolution: 2dppx), (-webkit-device-pixel-ratio: 2), (-moz-device-pixel-ratio: 2), (resolution: 192dpi) {
.resolution {
Expand Down
4 changes: 2 additions & 2 deletions tests/controls/15_no_query_fallback.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
* No Query
*/
.no-mq .no-query {
_query: '700px, "no-query" ".no-mq"';
_query: "700px, no-query .no-mq";
_expected: "@media (min-width: 700px)";
}
.no-mq .no-query {
_query: '700px, "no-query" ".no-mq"';
_query: "700px, no-query .no-mq";
_expected: "@media (min-width: 700px)";
}
2 changes: 1 addition & 1 deletion tests/controls/16_media.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* $media-plus-fence : tv 500px 700px;
* $media-only : only print;
* $media-not : not print;
* $media-not-plus-fenced : "not print" 500px 700px;
* $media-not-plus-fenced : not print 500px 700px;
*/
@media tv {
.media {
Expand Down
16 changes: 8 additions & 8 deletions tests/controls/17_breakpoint_function.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@
_context-holder: (min-width: 500px);
_query-count: 1;
/* Fenced with Media */
_test: 'breakpoint("not print" 500px 700px)';
_test: "breakpoint(not print 500px 700px)";
_query: "not print and (min-width: 500px) and (max-width: 700px)";
_fallback: false;
_context-holder: (media: "not print", min-width: 500px, max-width: 700px);
_query-count: 1;
/* Or Query */
_test: 'breakpoint(400px "min-height" 200px, 300px 325px orientation portriat monochrome)';
_test: "breakpoint(400px min-height 200px, 300px 325px orientation portriat monochrome)";
_query: " (min-width: 400px) and (min-height: 200px), (min-width: 300px) and (max-width: 325px) and (orientation: portriat) and (monochrome)";
_fallback: false;
_context-holder: (min-width: 400px 300px, "min-height": 200px false, max-width: false 325px, orientation: false portriat, "monochrome": false monochrome);
_query-count: 2;
/* No Query */
_test: 'breakpoint(700px, "no-query" ".no-mq")';
_test: "breakpoint(700px, no-query .no-mq)";
_query: " (min-width: 700px)";
_fallback: ".no-mq";
_context-holder: (min-width: 700px);
_query-count: 1;
/* No Query, Or */
_test: 'breakpoint("not screen", 500px, "no-query" ".no-mq")';
_test: "breakpoint(not screen, 500px, no-query .no-mq)";
_query: "not screen, (min-width: 500px)";
_fallback: ".no-mq";
_context-holder: (media: "not screen" all, min-width: false 500px);
Expand All @@ -42,23 +42,23 @@
_height: false;
_no-query: false;
/* Fenced with Media */
_test: "breakpoint(\"not print\" 500px 700px, 'min-width', 'max-width', 'media')";
_test: "breakpoint(not print 500px 700px, 'min-width', 'max-width', 'media')";
_min-width: 500px;
_max-width: 700px;
_media: "not print";
/* Or Query */
_test: 'breakpoint(400px "min-height" 200px, 300px 325px orientation portriat monochrome)';
_test: "breakpoint(400px min-height 200px, 300px 325px orientation portriat monochrome)";
_min-width: 400px 300px;
_min-height: 200px false;
_orientation: false portriat;
_no-query: false;
/* No Query */
_test: 'breakpoint(700px, "no-query" ".no-mq")';
_test: "breakpoint(700px, no-query .no-mq)";
_min-width: 700px;
_media: all;
_no-query: ".no-mq";
/* No Query, Or */
_test: 'breakpoint("not screen", 500px, "no-query" ".no-mq")';
_test: "breakpoint(not screen, 500px, no-query .no-mq)";
_min-width: false 500px;
_media: "not screen" all;
_no-query: ".no-mq";
Expand Down
4 changes: 2 additions & 2 deletions tests/controls/27_double_string-memo.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Double string feature (i.e. string: string)
* $aspect-ratio : "min-aspect-ratio" "300/250";
* $device-aspect-ratio : "max-device-aspect-ratio" "320/480";
* $aspect-ratio : min-aspect-ratio 300/250;
* $device-aspect-ratio : max-device-aspect-ratio 320/480;
*/
@media (min-aspect-ratio: 300 / 250) {
.aspect-ratio {
Expand Down
4 changes: 2 additions & 2 deletions tests/controls/29_breakpoint_resolutions-memo.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Resolution queries, device pixel ratio and standard resolution
* $device-pixel-ratio: "resolution" 2dppx
* $resolution: "min-resolution" 192dpi
* $device-pixel-ratio: resolution 2dppx
* $resolution: min-resolution 192dpi
*/
@media (resolution: 2dppx), (-webkit-device-pixel-ratio: 2), (-moz-device-pixel-ratio: 2), (resolution: 192dpi) {
.resolution {
Expand Down
4 changes: 2 additions & 2 deletions tests/controls/32_no_query_fallback-memo.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
* No Query
*/
.no-mq .no-query {
_query: '700px, "no-query" ".no-mq"';
_query: "700px, no-query .no-mq";
_expected: "@media (min-width: 700px)";
}
.no-mq .no-query {
_query: '700px, "no-query" ".no-mq"';
_query: "700px, no-query .no-mq";
_expected: "@media (min-width: 700px)";
}
2 changes: 1 addition & 1 deletion tests/controls/33_media-memo.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* $media-plus-fence : tv 500px 700px;
* $media-only : only print;
* $media-not : not print;
* $media-not-plus-fenced : "not print" 500px 700px;
* $media-not-plus-fenced : not print 500px 700px;
*/
@media tv {
.media {
Expand Down
16 changes: 8 additions & 8 deletions tests/controls/34_breakpoint_function-memo.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@
_context-holder: (min-width: 500px);
_query-count: 1;
/* Fenced with Media */
_test: 'breakpoint("not print" 500px 700px)';
_test: "breakpoint(not print 500px 700px)";
_query: "not print and (min-width: 500px) and (max-width: 700px)";
_fallback: false;
_context-holder: (media: "not print", min-width: 500px, max-width: 700px);
_query-count: 1;
/* Or Query */
_test: 'breakpoint(400px "min-height" 200px, 300px 325px orientation portriat monochrome)';
_test: "breakpoint(400px min-height 200px, 300px 325px orientation portriat monochrome)";
_query: " (min-width: 400px) and (min-height: 200px), (min-width: 300px) and (max-width: 325px) and (orientation: portriat) and (monochrome)";
_fallback: false;
_context-holder: (min-width: 400px 300px, "min-height": 200px false, max-width: false 325px, orientation: false portriat, "monochrome": false monochrome);
_query-count: 2;
/* No Query */
_test: 'breakpoint(700px, "no-query" ".no-mq")';
_test: "breakpoint(700px, no-query .no-mq)";
_query: " (min-width: 700px)";
_fallback: ".no-mq";
_context-holder: (min-width: 700px);
_query-count: 1;
/* No Query, Or */
_test: 'breakpoint("not screen", 500px, "no-query" ".no-mq")';
_test: "breakpoint(not screen, 500px, no-query .no-mq)";
_query: "not screen, (min-width: 500px)";
_fallback: ".no-mq";
_context-holder: (media: "not screen" all, min-width: false 500px);
Expand All @@ -42,23 +42,23 @@
_height: false;
_no-query: false;
/* Fenced with Media */
_test: "breakpoint(\"not print\" 500px 700px, 'min-width', 'max-width', 'media')";
_test: "breakpoint(not print 500px 700px, 'min-width', 'max-width', 'media')";
_min-width: 500px;
_max-width: 700px;
_media: "not print";
/* Or Query */
_test: 'breakpoint(400px "min-height" 200px, 300px 325px orientation portriat monochrome)';
_test: "breakpoint(400px min-height 200px, 300px 325px orientation portriat monochrome)";
_min-width: 400px 300px;
_min-height: 200px false;
_orientation: false portriat;
_no-query: false;
/* No Query */
_test: 'breakpoint(700px, "no-query" ".no-mq")';
_test: "breakpoint(700px, no-query .no-mq)";
_min-width: 700px;
_media: all;
_no-query: ".no-mq";
/* No Query, Or */
_test: 'breakpoint("not screen", 500px, "no-query" ".no-mq")';
_test: "breakpoint(not screen, 500px, no-query .no-mq)";
_min-width: false 500px;
_media: "not screen" all;
_no-query: ".no-mq";
Expand Down
Loading

0 comments on commit a8aaa22

Please sign in to comment.