Merge branch '2.x' into dev

2020-10-31 18:19:32 +08:00
parent 8f17b898f2 fcadc2d79f
commit 2d2f0d8ad4
29 changed files with 324 additions and 69 deletions
@@ -147,6 +147,31 @@ test('loading-icon prop', () => {
  expect(wrapper).toMatchSnapshot();
 });

+test('apply icon-prefix prop to error-icon', () => {
+  const wrapper = mount(VanImage, {
+    propsData: {
+      errorIcon: 'error',
+      iconPrefix: 'my-icon',
+      src: 'https://img.yzcdn.cn/vant/cat.jpeg',
+    },
+  });
+
+  wrapper.find('img').trigger('error');
+
+  expect(wrapper).toMatchSnapshot();
+});
+
+test('apply icon-prefix prop to loading-icon', () => {
+  const wrapper = mount(VanImage, {
+    propsData: {
+      loadingIcon: 'success',
+      iconPrefix: 'my-icon',
+    },
+  });
+
+  expect(wrapper).toMatchSnapshot();
+});
+
 test('radius prop', () => {
  const wrapper = mount(VanImage, {
    propsData: {