@@ -19,10 +19,8 @@ describe('progress', () => {
19
19
expect ( progress . chart . geometries [ 0 ] . elements [ 1 ] . shape . attr ( 'fill' ) ) . toBe ( '#E8EDF3' ) ;
20
20
21
21
progress . update ( {
22
- width : 200 ,
23
- height : 100 ,
22
+ ...progress . options ,
24
23
percent : 0.5 ,
25
- autoFit : false ,
26
24
} ) ;
27
25
expect ( progress . chart . geometries [ 0 ] . elements [ 0 ] . getData ( ) . type ) . toBe ( 'current' ) ;
28
26
expect ( progress . chart . geometries [ 0 ] . elements [ 0 ] . getData ( ) . percent ) . toBe ( 0.5 ) ;
@@ -50,11 +48,8 @@ describe('progress', () => {
50
48
expect ( progress . chart . geometries [ 0 ] . elements [ 1 ] . shape . attr ( 'fill' ) ) . toBe ( '#654321' ) ;
51
49
52
50
progress . update ( {
53
- width : 200 ,
54
- height : 100 ,
55
- percent : 0.6 ,
56
- color : ( ) => [ '#654321' , '#123456' ] ,
57
- autoFit : false ,
51
+ ...progress . options ,
52
+ color : [ '#654321' , '#123456' ] ,
58
53
} ) ;
59
54
expect ( progress . chart . geometries [ 0 ] . elements [ 0 ] . getData ( ) . type ) . toBe ( 'current' ) ;
60
55
expect ( progress . chart . geometries [ 0 ] . elements [ 0 ] . getData ( ) . percent ) . toBe ( 0.6 ) ;
@@ -91,7 +86,7 @@ describe('progress', () => {
91
86
expect ( progress . chart . geometries [ 0 ] . elements [ 1 ] . shape . attr ( 'lineWidth' ) ) . toBe ( 2 ) ;
92
87
expect ( progress . chart . geometries [ 0 ] . elements [ 1 ] . shape . attr ( 'lineDash' ) ) . toEqual ( [ 2 , 2 ] ) ;
93
88
94
- const progressStyle = ( x , percent , type ) => {
89
+ const progressStyle = ( percent , type ) => {
95
90
if ( type === 'current' ) {
96
91
return percent > 0.5
97
92
? {
@@ -120,11 +115,8 @@ describe('progress', () => {
120
115
} ;
121
116
122
117
progress . update ( {
123
- width : 200 ,
124
- height : 100 ,
125
- percent : 0.6 ,
118
+ ...progress . options ,
126
119
progressStyle,
127
- autoFit : false ,
128
120
} ) ;
129
121
expect ( progress . chart . geometries [ 0 ] . elements [ 0 ] . getData ( ) . type ) . toBe ( 'current' ) ;
130
122
expect ( progress . chart . geometries [ 0 ] . elements [ 0 ] . getData ( ) . percent ) . toBe ( 0.6 ) ;
@@ -140,11 +132,8 @@ describe('progress', () => {
140
132
expect ( progress . chart . geometries [ 0 ] . elements [ 1 ] . shape . attr ( 'lineDash' ) ) . toEqual ( [ 4 , 4 ] ) ;
141
133
142
134
progress . update ( {
143
- width : 200 ,
144
- height : 100 ,
135
+ ...progress . options ,
145
136
percent : 0.4 ,
146
- progressStyle,
147
- autoFit : false ,
148
137
} ) ;
149
138
150
139
expect ( progress . chart . geometries [ 0 ] . elements [ 0 ] . getData ( ) . type ) . toBe ( 'current' ) ;
@@ -160,4 +149,18 @@ describe('progress', () => {
160
149
expect ( progress . chart . geometries [ 0 ] . elements [ 1 ] . shape . attr ( 'lineWidth' ) ) . toBe ( 4 ) ;
161
150
expect ( progress . chart . geometries [ 0 ] . elements [ 1 ] . shape . attr ( 'lineDash' ) ) . toEqual ( [ 4 , 4 ] ) ;
162
151
} ) ;
152
+
153
+ it ( 'barWidthRatio' , ( ) => {
154
+ const progress = new Progress ( createDiv ( ) , {
155
+ width : 200 ,
156
+ height : 100 ,
157
+ percent : 0.6 ,
158
+ barWidthRatio : 0.1 ,
159
+ autoFit : false ,
160
+ } ) ;
161
+
162
+ progress . render ( ) ;
163
+
164
+ expect ( progress . chart . getTheme ( ) . columnWidthRatio ) . toBe ( 0.1 ) ;
165
+ } ) ;
163
166
} ) ;
0 commit comments