Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Element
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
林焕东
Element
Commits
067541e8
Commit
067541e8
authored
Feb 24, 2017
by
杨奕
Committed by
baiyaaaaa
Feb 24, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improve tests (#3033)
parent
c77489a4
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
102 additions
and
13 deletions
+102
-13
examples/docs/en-US/cascader.md
examples/docs/en-US/cascader.md
+2
-1
examples/docs/zh-CN/cascader.md
examples/docs/zh-CN/cascader.md
+2
-1
packages/color-picker/src/components/sv-panel.vue
packages/color-picker/src/components/sv-panel.vue
+7
-7
packages/theme-default/src/color-picker.css
packages/theme-default/src/color-picker.css
+3
-1
test/unit/specs/carousel.spec.js
test/unit/specs/carousel.spec.js
+3
-1
test/unit/specs/color-picker.spec.js
test/unit/specs/color-picker.spec.js
+83
-1
test/unit/specs/menu.spec.js
test/unit/specs/menu.spec.js
+2
-1
No files found.
examples/docs/en-US/cascader.md
View file @
067541e8
...
...
@@ -474,7 +474,8 @@ There are two ways to expand child option items.
label
:
'
Design Documentation
'
}]
}],
selectedOptions
:
[]
selectedOptions
:
[],
selectedOptions2
:
[]
};
},
methods
:
{
...
...
examples/docs/zh-CN/cascader.md
View file @
067541e8
...
...
@@ -505,7 +505,8 @@
label
:
'
组件交互文档
'
}]
}],
selectedOptions
:
[]
selectedOptions
:
[],
selectedOptions2
:
[]
};
},
methods
:
{
...
...
packages/color-picker/src/components/sv-panel.vue
View file @
067541e8
...
...
@@ -47,11 +47,9 @@
this
.
cursorTop
=
(
100
-
value
)
*
height
/
100
;
this
.
background
=
'
hsl(
'
+
this
.
color
.
get
(
'
hue
'
)
+
'
, 100%, 50%)
'
;
}
},
},
mounted
()
{
const
handleDrag
=
(
event
)
=>
{
handleDrag
(
event
)
{
const
el
=
this
.
$el
;
const
rect
=
el
.
getBoundingClientRect
();
...
...
@@ -69,14 +67,16 @@
saturation
:
left
/
rect
.
width
*
100
,
value
:
100
-
top
/
rect
.
height
*
100
});
};
}
},
mounted
()
{
draggable
(
this
.
$el
,
{
drag
:
(
event
)
=>
{
handleDrag
(
event
);
this
.
handleDrag
(
event
);
},
end
:
(
event
)
=>
{
handleDrag
(
event
);
this
.
handleDrag
(
event
);
}
});
...
...
packages/theme-default/src/color-picker.css
View file @
067541e8
...
...
@@ -209,6 +209,7 @@
padding
:
6px
;
border
:
1px
solid
#bfcbd9
;
border-radius
:
4px
;
font-size
:
0
;
}
@descendent
color
{
...
...
@@ -237,7 +238,7 @@
@descendent
empty
{
font-size
:
12px
;
vertical-align
:
middle
;
margin-top
:
-2
px
;
margin-top
:
4
px
;
color
:
#666
;
}
...
...
@@ -248,6 +249,7 @@
margin-left
:
8px
;
width
:
12px
;
color
:
#888
;
font-size
:
12px
;
}
@descendent
panel
{
...
...
test/unit/specs/carousel.spec.js
View file @
067541e8
...
...
@@ -138,7 +138,7 @@ describe('Carousel', () => {
vm
=
createVue
({
template
:
`
<div>
<el-carousel :autoplay="false" trigger="click">
<el-carousel :autoplay="false" trigger="click"
ref="carousel"
>
<el-carousel-item v-for="item in 3"></el-carousel-item>
</el-carousel>
</div>
...
...
@@ -147,9 +147,11 @@ describe('Carousel', () => {
setTimeout
(()
=>
{
const
items
=
vm
.
$el
.
querySelectorAll
(
'
.el-carousel__item
'
);
const
carousel
=
vm
.
$refs
.
carousel
;
vm
.
$el
.
querySelectorAll
(
'
.el-carousel__indicator
'
)[
2
].
click
();
setTimeout
(()
=>
{
expect
(
items
[
2
].
classList
.
contains
(
'
is-active
'
)).
to
.
true
;
carousel
.
handleButtonEnter
(
'
right
'
);
vm
.
$el
.
querySelector
(
'
.el-carousel__arrow--right
'
).
click
();
setTimeout
(()
=>
{
expect
(
items
[
0
].
classList
.
contains
(
'
is-active
'
)).
to
.
true
;
...
...
test/unit/specs/color-picker.spec.js
View file @
067541e8
...
...
@@ -11,7 +11,7 @@ describe('ColorPicker', () => {
if
(
dropdown
&&
dropdown
.
parentNode
)
dropdown
.
parentNode
.
removeChild
(
dropdown
);
});
it
(
'
should work
s
'
,
()
=>
{
it
(
'
should work
'
,
()
=>
{
vm
=
createTest
(
ColorPicker
,
true
);
expect
(
vm
.
$el
).
to
.
exist
;
});
...
...
@@ -133,5 +133,87 @@ describe('ColorPicker', () => {
},
30
);
},
ANIMATION_TIME
);
});
it
(
'
should change hue when clicking the hue bar
'
,
(
done
)
=>
{
const
vm
=
createVue
({
template
:
`
<el-color-picker v-model="color"></el-color-picker>
`
,
data
()
{
return
{
color
:
'
#f00
'
};
}
},
true
);
const
trigger
=
vm
.
$el
.
querySelector
(
'
.el-color-picker__trigger
'
);
trigger
.
click
();
setTimeout
(()
=>
{
const
hueBar
=
document
.
querySelector
(
'
.el-color-hue-slider
'
);
hueBar
.
__vue__
.
handleClick
({
target
:
null
,
clientX
:
0
,
clientY
:
1000
});
vm
.
$nextTick
(()
=>
{
const
picker
=
vm
.
$children
[
0
];
expect
(
picker
.
color
.
_hue
>
0
).
to
.
true
;
done
();
});
},
ANIMATION_TIME
);
});
it
(
'
should change alpha when clicking the alpha bar
'
,
(
done
)
=>
{
const
vm
=
createVue
({
template
:
`
<el-color-picker v-model="color" show-alpha></el-color-picker>
`
,
data
()
{
return
{
color
:
'
#f00
'
};
}
},
true
);
const
trigger
=
vm
.
$el
.
querySelector
(
'
.el-color-picker__trigger
'
);
trigger
.
click
();
setTimeout
(()
=>
{
const
alphaBar
=
document
.
querySelector
(
'
.el-color-alpha-slider
'
);
alphaBar
.
__vue__
.
handleClick
({
target
:
null
,
clientX
:
50
,
clientY
:
0
});
vm
.
$nextTick
(()
=>
{
const
picker
=
vm
.
$children
[
0
];
expect
(
picker
.
color
.
_alpha
<
1
).
to
.
true
;
done
();
});
},
ANIMATION_TIME
);
});
it
(
'
should change saturation and value when clicking the sv-panel
'
,
(
done
)
=>
{
const
vm
=
createVue
({
template
:
`
<el-color-picker v-model="color" color-format="hsv"></el-color-picker>
`
,
data
()
{
return
{
color
:
'
hsv(0, 50%, 50%)
'
};
}
},
true
);
const
trigger
=
vm
.
$el
.
querySelector
(
'
.el-color-picker__trigger
'
);
trigger
.
click
();
setTimeout
(()
=>
{
const
svPanel
=
document
.
querySelector
(
'
.el-color-svpanel
'
);
svPanel
.
__vue__
.
handleDrag
({
clientX
:
0
,
clientY
:
0
});
vm
.
$nextTick
(()
=>
{
const
picker
=
vm
.
$children
[
0
];
expect
(
picker
.
color
.
_saturation
!==
50
).
to
.
true
;
expect
(
picker
.
color
.
_value
!==
50
).
to
.
true
;
done
();
});
},
ANIMATION_TIME
);
});
});
test/unit/specs/menu.spec.js
View file @
067541e8
...
...
@@ -146,7 +146,8 @@ describe('Menu', () => {
});
});
});
describe
(
'
submenu
'
,
()
=>
{
describe
(
'
submenu
'
,
function
()
{
this
.
timeout
(
3000
);
it
(
'
toggle
'
,
done
=>
{
vm
=
createVue
({
template
:
`
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment