Merge pull request #24 from Exabyte-io/fix/SOF-6197

chore: rename static class variables
Exabyte-io · Aug 31, 2022 · cd3f9ba · cd3f9ba
2 parents a9cc8ff + 3743d96
commit cd3f9ba
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/context/mixins.js b/src/context/mixins.js
@@ -7,11 +7,11 @@ export const ApplicationContextMixin = (superclass) =>
     class extends superclass {
         constructor(config) {
             super(config);
-            if (!this.constructor.applicationCls)
-                throw Error("ApplicationContextMixin: applicationCls is undefined");
+            if (!this.constructor.Application)
+                throw Error("ApplicationContextMixin: Application is undefined");
             this._application =
                 (config.context && config.context.application) ||
-                this.constructor.applicationCls.createDefault();
+                this.constructor.Application.createDefault();
         }
 
         get application() {
@@ -23,11 +23,11 @@ export const MaterialContextMixin = (superclass) =>
     class extends superclass {
         constructor(config) {
             super(config);
-            if (!this.constructor.materialCls) {
-                throw Error("MaterialContextMixin: materialCls is undefined");
+            if (!this.constructor.Material) {
+                throw Error("MaterialContextMixin: Material is undefined");
             }
             this._material = config.context && config.context.material;
-            if (!this._material) this._material = this.constructor.materialCls.createDefault();
+            if (!this._material) this._material = this.constructor.Material.createDefault();
             this.updateMaterialHash();
         }
 
@@ -82,13 +82,13 @@ export const MaterialsContextMixin = (superclass) =>
         constructor(config) {
             super(config);
             const materials = this.config.context && this.config.context.materials;
-            if (!this.constructor.materialCls) {
-                throw Error("MaterialsContextMixin: materialCls is undefined");
+            if (!this.constructor.Material) {
+                throw Error("MaterialsContextMixin: Material is undefined");
             }
             this._materials =
                 materials && materials.length
                     ? materials
-                    : [this.constructor.materialCls.createDefault()];
+                    : [this.constructor.Material.createDefault()];
         }
 
         get materials() {

diff --git a/tests/context.tests.js b/tests/context.tests.js
@@ -32,15 +32,15 @@ class ProviderEntity extends mix(InMemoryEntity).with(
     MaterialContextMixin,
     ApplicationContextMixin,
 ) {
-    static materialCls = MockMaterial;
+    static Material = MockMaterial;
 
-    static applicationCls = MockApplication;
+    static Application = MockApplication;
 }
 
 class DerivedProviderEntity extends ProviderEntity {
-    static materialCls = SpecificMockMaterial;
+    static Material = SpecificMockMaterial;
 
-    static applicationCls = SpecificMockApplication;
+    static Application = SpecificMockApplication;
 }
 
 describe("Material & Application ContextMixin", () => {