@@ -44,11 +44,7 @@ rule j end {}
44
44
"# ;
45
45
46
46
let mut ret = Vec :: new ( ) ;
47
- get_differences (
48
- & load_css_paths ( against. as_bytes ( ) ) ,
49
- & load_css_paths ( text. as_bytes ( ) ) ,
50
- & mut ret,
51
- ) ;
47
+ get_differences ( & load_css_paths ( against) . unwrap ( ) , & load_css_paths ( text) . unwrap ( ) , & mut ret) ;
52
48
assert ! ( ret. is_empty( ) ) ;
53
49
}
54
50
61
57
c // sdf
62
58
d {}
63
59
"# ;
64
- let paths = load_css_paths ( text. as_bytes ( ) ) ;
65
- assert ! ( paths. children . contains ( & CssPath :: new ( "a b c d" . to_owned( ) ) ) ) ;
60
+ let paths = load_css_paths ( text) . unwrap ( ) ;
61
+ assert ! ( paths. contains_key ( & "a b c d" . to_owned( ) ) ) ;
66
62
}
67
63
68
64
#[ test]
69
65
fn test_comparison ( ) {
70
66
let x = r#"
71
- a {
72
- b {
73
- c {}
74
- }
67
+ @a {
68
+ b {}
75
69
}
76
70
"# ;
77
71
78
72
let y = r#"
79
- a {
73
+ @ a {
80
74
b {}
75
+ c {}
81
76
}
82
77
"# ;
83
78
84
- let against = load_css_paths ( y. as_bytes ( ) ) ;
85
- let other = load_css_paths ( x. as_bytes ( ) ) ;
79
+ let against = load_css_paths ( y) . unwrap ( ) ;
80
+ let other = load_css_paths ( x) . unwrap ( ) ;
86
81
87
82
let mut ret = Vec :: new ( ) ;
88
83
get_differences ( & against, & other, & mut ret) ;
89
84
assert ! ( ret. is_empty( ) ) ;
90
85
get_differences ( & other, & against, & mut ret) ;
91
- assert_eq ! ( ret, vec![ " Missing \" c \" rule" . to_owned( ) ] ) ;
86
+ assert_eq ! ( ret, vec![ " Missing rule `c` " . to_owned( ) ] ) ;
92
87
}
93
88
94
89
#[ test]
95
90
fn check_empty_css ( ) {
96
- let events = load_css_events ( & [ ] ) ;
97
- assert_eq ! ( events . len( ) , 0 ) ;
91
+ let paths = load_css_paths ( "" ) . unwrap ( ) ;
92
+ assert_eq ! ( paths . len( ) , 0 ) ;
98
93
}
99
94
100
95
#[ test]
101
96
fn check_invalid_css ( ) {
102
- let events = load_css_events ( b "*") ;
103
- assert_eq ! ( events . len( ) , 0 ) ;
97
+ let paths = load_css_paths ( "*" ) . unwrap ( ) ;
98
+ assert_eq ! ( paths . len( ) , 0 ) ;
104
99
}
105
100
106
101
#[ test]
107
102
fn test_with_minification ( ) {
108
103
let text = include_str ! ( "../html/static/css/themes/dark.css" ) ;
109
104
let minified = minifier:: css:: minify ( & text) . expect ( "CSS minification failed" ) . to_string ( ) ;
110
105
111
- let against = load_css_paths ( text. as_bytes ( ) ) ;
112
- let other = load_css_paths ( minified. as_bytes ( ) ) ;
106
+ let against = load_css_paths ( text) . unwrap ( ) ;
107
+ let other = load_css_paths ( & minified) . unwrap ( ) ;
113
108
114
109
let mut ret = Vec :: new ( ) ;
115
110
get_differences ( & against, & other, & mut ret) ;
116
111
assert ! ( ret. is_empty( ) ) ;
117
112
}
113
+
114
+ #[ test]
115
+ fn test_media ( ) {
116
+ let text = r#"
117
+ @media (min-width: 701px) {
118
+ a:hover {
119
+ color: #fff;
120
+ }
121
+
122
+ b {
123
+ x: y;
124
+ }
125
+ }
126
+ "# ;
127
+
128
+ let paths = load_css_paths ( text) . unwrap ( ) ;
129
+ eprintln ! ( "{:?}" , paths) ;
130
+ let p = paths. get ( "@media (min-width:701px)" ) ;
131
+ assert ! ( p. is_some( ) ) ;
132
+ let p = p. unwrap ( ) ;
133
+ assert ! ( p. children. get( "a:hover" ) . is_some( ) ) ;
134
+ assert ! ( p. children. get( "b" ) . is_some( ) ) ;
135
+ }
0 commit comments