Merge pull request #2 from adobe/context_mismatch

Unify the context structure.

Author: dompuiu

src/rules/__tests__/getExtensionSettingsByRuleComponent.test.js

@@ -12,6 +12,25 @@ governing permissions and limitations under the License.
 const getExtensionSettingsByRuleComponent = require('../getExtensionSettingsByRuleComponent');
 
 describe('getExtensionSettingsByRuleComponent', () => {
+  test('calls getExtensionSettings with the full context data', () => {
+    const arcAndUtils = { arc: { contextData1: 2 }, utils: {} };
+    const extensionSettingsMockFn = jest.fn(() => Promise.resolve());
+
+    return getExtensionSettingsByRuleComponent({
+      delegateConfig: {
+        extension: {
+          getExtensionSettings: extensionSettingsMockFn
+        }
+      },
+      arcAndUtils
+    }).then(() => {
+      expect(extensionSettingsMockFn).toHaveBeenCalledWith({
+        arcAndUtils: { arc: { contextData1: 2 }, utils: {} },
+        delegateConfig: { extension: expect.any(Object) }
+      });
+    });
+  });
+
   test('adds the extension settings to the context data', () => {
     const extensionSettings = { setting1: 1 };
     const arcAndUtils = { arc: { contextData1: 2 }, utils: {} };

src/rules/getExtensionSettingsByRuleComponent.js

@@ -9,7 +9,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-module.exports = ({ arcAndUtils, delegateConfig }) => {
+module.exports = (context) => {
+  const { arcAndUtils, delegateConfig } = context;
   const { utils } = arcAndUtils;
   let {
     extension: { getExtensionSettings }
@@ -19,7 +20,7 @@ module.exports = ({ arcAndUtils, delegateConfig }) => {
     getExtensionSettings = () => Promise.resolve({});
   }
 
-  return getExtensionSettings(arcAndUtils).then((extensionSettings) => ({
+  return getExtensionSettings(context).then((extensionSettings) => ({
     arcAndUtils: {
       ...arcAndUtils,
       utils: {