Move radius test into test for Circle mixin and include Path there

Author: mikeu

tests/mixin-tests/circle-tests.js

@@ -0,0 +1,32 @@
+import { getWrapperWithMap } from '@/tests/test-helpers';
+import { testPathFunctionality } from './path-tests';
+
+export const testCircleFunctionality = (component, componentName = 'it') => {
+  // The Circle mixin includes the Path mixin.
+  testPathFunctionality(component, componentName);
+
+  // Radius
+
+  test(`${componentName} has a getRadius method`, () => {
+    const { wrapper } = getWrapperWithMap(component);
+
+    expect(typeof wrapper.vm.mapObject.getRadius).toEqual('function');
+  });
+
+  test(`${componentName} accepts and uses radius prop`, () => {
+    const radius = 100;
+    const { wrapper } = getWrapperWithMap(component, { radius });
+
+    expect(wrapper.vm.mapObject.getRadius()).toEqual(radius);
+  });
+
+  test(`${componentName} updates radius when prop changes`, async () => {
+    const { wrapper } = getWrapperWithMap(component, { radius: 100 });
+
+    const newRadius = 2000;
+    wrapper.setProps({ radius: newRadius });
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.vm.mapObject.getRadius()).toEqual(newRadius);
+  });
+};

tests/unit/components/LCircle.spec.js

@@ -1,5 +1,5 @@
 import { getWrapperWithMap } from '@/tests/test-helpers';
-import { testPathFunctionality } from '@/tests/mixin-tests/path-tests';
+import { testCircleFunctionality } from '@/tests/mixin-tests/circle-tests';
 import LCircle from '@/components/LCircle.vue';
 import L from 'leaflet';
 
@@ -10,6 +10,10 @@ describe('component: LCircle.vue', () => {
     expect(wrapper.vm.mapObject).toBeDefined();
   });
 
+  // Circle mixin
+
+  testCircleFunctionality(LCircle, 'LCircle.vue');
+
   // latLng property
 
   test('LCircle.vue accepts and uses latLng prop as an array', () => {
@@ -45,25 +49,4 @@ describe('component: LCircle.vue', () => {
 
     expect(wrapper.vm.mapObject.getLatLng()).toEqual(newLatLng);
   });
-
-  // radius property
-
-  test('LCircle.vue accepts and uses radius prop', () => {
-    const radius = 42;
-    const { wrapper } = getWrapperWithMap(LCircle, { radius });
-    expect(wrapper.vm.mapObject.getRadius()).toBe(radius);
-  });
-
-  test('LCircle.vue updates the mapObject radius when prop changes', async () => {
-    const radius = 42;
-    const { wrapper } = getWrapperWithMap(LCircle, { radius });
-
-    const newRadius = 137;
-    wrapper.setProps({ radius: newRadius });
-    await wrapper.vm.$nextTick();
-
-    expect(wrapper.vm.mapObject.getRadius()).toBe(newRadius);
-  });
-
-  testPathFunctionality(LCircle, 'LCircle.vue');
 });