Skip to content

Commit

Permalink
fix tests for rework 0.15.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathanong committed Jun 3, 2013
1 parent 82c176c commit 4c919ad
Show file tree
Hide file tree
Showing 14 changed files with 31 additions and 30 deletions.
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "rework-inherit",
"description": "Inherit rules from other selectors",
"repo": "jonathanong/rework-inherit",
"version": "0.1.2",
"version": "0.1.3",
"peerDependencies": {
"visionmedia/rework": "*"
},
Expand Down
3 changes: 2 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ exports.Inherit = Inherit
function Inherit(style, options) {
if (!(this instanceof Inherit))
return new Inherit(style, options);

options = options || {}

this.propertyRegExp = options.propertyRegExp || /^inherits?$/
Expand Down Expand Up @@ -117,6 +117,7 @@ Inherit.prototype.matchQueryRule = function (val, query) {
selectors: rule.selectors,
declarations: rule.declarations,
rule: {
type: 'rule',
selectors: [],
declarations: rule.declarations
}
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "rework-inherit",
"description": "Inherit rules from other selectors",
"version": "0.1.2",
"version": "0.1.3",
"peerDependencies": {
"rework": "*"
},
"devDependencies": {
"rework": ">= 0.14.0"
"rework": "*"
},
"scripts": {
"test": "node test"
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/chain.out.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.a,
.b,
.c {
color: red
color: red;
}
4 changes: 2 additions & 2 deletions test/fixtures/clearfix.out.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.clearfix:before,
.clearfix:after {
content: " ";
display: table
display: table;
}

.clearfix:after {
clear: both
clear: both;
}
6 changes: 3 additions & 3 deletions test/fixtures/clearfix.zoom.out.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
.clearfix {
*zoom: 1
*zoom: 1;
}

.clearfix:before,
.clearfix:after {
content: " ";
display: table
display: table;
}

.clearfix:after {
clear: both
clear: both;
}
6 changes: 3 additions & 3 deletions test/fixtures/combined.out.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
.some-button {
color: black
color: black;
}

.some-button + .some-button {
color: green
color: green;
}

.button-group .some-button {
color: red
color: red;
}
4 changes: 2 additions & 2 deletions test/fixtures/disable.media.out.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.gray {
color: gray
color: gray;
}

@media (min-width: 320px) {
.button {
inherit: .gray
inherit: .gray;
}
}
6 changes: 3 additions & 3 deletions test/fixtures/media.disjoint.out.css
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
.gray {
color: gray
color: gray;
}

@media (min-width: 320px) {
.button1,
.button2 {
color: gray
color: gray;
}
}

.black {
color: black
color: black;
}
4 changes: 2 additions & 2 deletions test/fixtures/media.out.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.gray {
color: gray
color: gray;
}

@media (min-width: 320px) {
.button {
color: gray
color: gray;
}
}
4 changes: 2 additions & 2 deletions test/fixtures/multiple.out.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.gray,
.button {
color: gray
color: gray;
}

.red,
.button {
color: red
color: red;
}
4 changes: 2 additions & 2 deletions test/fixtures/substring.out.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.button {
color: green
color: green;
}

div .button {
color: red
color: red;
}
10 changes: 5 additions & 5 deletions test/fixtures/tag.out.css
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
em,
.test {
text-decoration: bold
text-decoration: bold;
}

a em,
a .test {
color: red
color: red;
}

em > span,
.test > span {
color: yellow
color: yellow;
}

.emphasis {
text-decoration: bold
text-decoration: bold;
}

.them {
color: gray
color: gray;
}
2 changes: 1 addition & 1 deletion test/fixtures/unordered.out.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.b,
.a {
color: red
color: red;
}

0 comments on commit 4c919ad

Please sign in to comment.