refactor: config adjustments

Author: dmitry-stepanenko

README.md

@@ -29,7 +29,7 @@ runValueAccessorTests({
         declarations: [ComboboxComponent],
     },
     supportsOnBlur: true,
-    getNativeControlSelector: 'input.combobox-input',
+    nativeControlSelector: 'input.combobox-input',
     internalValueChangeSetter: (fixture, value) => {
         fixture.componentInstance.setValue(value, true);
     },
@@ -79,9 +79,9 @@ This is related to the ability to track blur events in order to set `emitOn: 'bl
 
 If set to true, component will be tested to not call `onTouched` event when value changed.
 Instead of this, it will be expected to trigger this function
-by html blur event using native control (see `getNativeControlSelector`in this config).
+by html blur event using native control (see `nativeControlSelector`in this config).
 
-#### getNativeControlSelector?: string
+#### nativeControlSelector?: string
 
 CSS selector for the element, that should dispatch `blur` event. Required and used only if `supportsOnBlur` is set to true.
 Provided selected will be used to programmatically dispatch `blur` event.
@@ -95,7 +95,7 @@ Example:
 For the CVA with HTML as above the following should be provided:
 
 ```typescript
-getNativeControlSelector: 'input.combobox-input';
+nativeControlSelector: 'input.combobox-input';
 ```
 
 #### internalValueChangeSetter: (fixture: ComponentFixture<H>, value: any) => void

apps/integration/src/app/controls/combobox/combobox.component.spec.ts

@@ -7,7 +7,7 @@ runValueAccessorTests({
         declarations: [ComboboxComponent],
     },
     supportsOnBlur: true,
-    getNativeControlSelector: 'input.combobox-input',
+    nativeControlSelector: 'input.combobox-input',
     internalValueChangeSetter: (fixture, value) => {
         fixture.componentInstance.setValue(value, true);
     },

apps/integration/src/app/controls/toggle/toggle.component.spec.ts

@@ -9,7 +9,7 @@ runValueAccessorTests({
         imports: [FormsModule],
     },
     supportsOnBlur: true,
-    getNativeControlSelector: 'input.toggle__input',
+    nativeControlSelector: 'input.toggle__input',
     internalValueChangeSetter: (fixture, value) => {
         fixture.componentInstance.setValue(value, true);
     },

libs/ngx-cva-test-suite/package.json

@@ -3,7 +3,7 @@
     "description": "Standardise your custom UI form components with ControlValueAccessor Test Suite",
     "author": "Dmitriy Stepanenko",
     "license": "MIT",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "repository": {
         "type": "git",
         "url": "https://github.com/dmitry-stepanenko/ngx-cva-test-suite"

libs/ngx-cva-test-suite/src/lib/models/test-config.models.ts

@@ -37,7 +37,7 @@ export interface CVATestConfig<T extends CVAComponentType, H = T> {
      *
      * If set to true, component will be tested to not call `onTouched` event when value changed.
      * Instead of this, it will be expected to trigger this function
-     * by html blur event using native control (see `getNativeControlSelector`in this config).
+     * by html blur event using native control (see `nativeControlSelector`in this config).
      */
     supportsOnBlur: boolean;
     /**
@@ -51,10 +51,10 @@ export interface CVATestConfig<T extends CVAComponentType, H = T> {
      * For the CVA with HTML as above the following should be provided:
      *
      * ```typescript
-     * getNativeControlSelector: 'input.combobox-input'
+     * nativeControlSelector: 'input.combobox-input'
      * ```
      */
-    getNativeControlSelector?: string;
+    nativeControlSelector?: string;
     /**
      * Tests the approach that is used to set value in the component, when the change is internal
      * (e.g. by clicking on an option of the select or typing in the input field).

libs/ngx-cva-test-suite/src/lib/ngx-cva-test-suite.spec.ts

@@ -27,7 +27,7 @@ runValueAccessorTests<DefaultValueAccessor, DefaultCVAWrapperComponent>({
         getTestingComponent: (fixture) => fixture.componentInstance.defaultCtrl,
     },
     supportsOnBlur: true,
-    getNativeControlSelector: 'input[ngDefaultControl]',
+    nativeControlSelector: 'input[ngDefaultControl]',
     internalValueChangeSetter: null,
     getComponentValue: (fixture) => fixture.componentInstance.value,
     resetCustomValue: { value: '' },

libs/ngx-cva-test-suite/src/lib/ngx-cva-test-suite.ts

@@ -22,7 +22,7 @@ import { TestRunnerResolver } from './utils/test-runner-resolver';
  *         declarations: [ComboboxComponent],
  *     },
  *     supportsOnBlur: true,
- *     getNativeControlSelector: 'input.combobox-input',
+ *     nativeControlSelector: 'input.combobox-input',
  *     internalValueChangeSetter: (fixture, value) => {
  *         fixture.componentInstance.setValue(value, true);
  *     },
@@ -207,8 +207,8 @@ export function runValueAccessorTests<T extends CVAComponentType, H = T>(config:
                 setupPlainValues();
                 let nativeControlDebugElement: DebugElement;
                 let nativeControl: EventTarget | undefined;
-                if (config.getNativeControlSelector) {
-                    nativeControlDebugElement = fixture.debugElement.query(By.css(config.getNativeControlSelector));
+                if (config.nativeControlSelector) {
+                    nativeControlDebugElement = fixture.debugElement.query(By.css(config.nativeControlSelector));
                     nativeControl = nativeControlDebugElement?.nativeElement;
                 }
                 expect(nativeControl).toBeDefined();
@@ -226,8 +226,8 @@ function getValues(): [string, string, string] {
 }
 
 function validateConfig(config: CVATestConfig<any>) {
-    if (config.supportsOnBlur && typeof config.getNativeControlSelector !== 'string') {
-        throw new Error('Expected "getNativeControlSelector" to be defined, if "supportsOnBlur" is set to true.');
+    if (config.supportsOnBlur && typeof config.nativeControlSelector !== 'string') {
+        throw new Error('Expected "nativeControlSelector" to be defined, if "supportsOnBlur" is set to true.');
     }
 }
 

scripts/local-publish.sh

@@ -15,5 +15,11 @@ npm run build-package
 echo "Running \"npm pack\".."
 cd dist/libs/ngx-cva-test-suite/ 
 npm pack
-echo "Publishing.."
-npm publish
+
+if [ $# -ne 0 ] && [ $1 = '--publish' ]
+then
+    echo "Publishing.."
+    npm publish
+else
+    echo 'Stopped before publishing'
+fi