popcodeorg · outoftime · Jan 31, 2020 · Nov 13, 2019 · Nov 15, 2019 · Nov 16, 2019
diff --git a/src/logic/__tests__/helpers/validateSource.test.js b/src/logic/__tests__/helpers/validateSource.test.js
@@ -0,0 +1,42 @@
+import validateSource from '../../helpers/validateSource';
+import {validatedSource} from '../../../actions/errors';
+
+const mockValidationErrors = {
+  css: 'invalid CSS selector',
+};
+
+const mockCssValidate = jest.fn(x => mockValidationErrors);
+
+jest.mock('../../../util/retryingFailedImports', () =>
+  jest.fn(x => ({
+    css: mockCssValidate,
+  })),
+);
+
+const mockActionCreator = (language, errors) => ({
+  type: 'VALIDATED_SOURCE',
+  payload: {
+    errors: {
+      [language]: errors[language],
+      language,
+    },
+  },
+});
+
+jest.mock('../../../actions/errors', () => ({
+  validatedSource: jest.fn((language, errors) =>
+    mockActionCreator(language, errors),
+  ),
+}));
+
+test('calls validateSource with validationErrors', async () => {
+  const language = 'css';
+  const source = 'dib { color: green;}';
+  const projectAttributes = {};
+  const dispatch = jest.fn();
+  await validateSource({language, source, projectAttributes}, dispatch);
+  expect(mockCssValidate).toHaveBeenCalledWith(source, projectAttributes);
+  expect(validatedSource).toHaveBeenCalledWith(language, mockValidationErrors);
+  const payload = validatedSource(language, mockValidationErrors);
+  expect(dispatch).toHaveBeenCalledWith(payload);
+});
diff --git a/src/logic/__tests__/validateCurrentProject.test.js b/src/logic/__tests__/validateCurrentProject.test.js
@@ -0,0 +1,56 @@
+import validateCurrentProject from '../validateCurrentProject';
+
+import Analyzer from '../../analyzers';
+import validateSource from '../helpers/validateSource';
+import {getCurrentProject} from '../../selectors';
+
+const mockHtmlSource = '<html></html>';
+const mockCssSource = 'div {}';
+
+jest.mock('../../analyzers');
+jest.mock('../helpers/validateSource');
+jest.mock('../../selectors', () => ({
+  getCurrentProject: jest.fn(() => ({
+    sources: {
+      html: mockHtmlSource,
+      css: mockCssSource,
+    },
+  })),
+}));
+
+const dummyState = {};
+
+test('should validate current project', async () => {
+  const dispatch = jest.fn();
+  const done = jest.fn();
+  await validateCurrentProject.process(
+    {
+      getState: () => dummyState,
+    },
+    dispatch,
+    done,
+  );
+  expect(getCurrentProject).toHaveBeenCalledWith(dummyState);
+  const analyzerPayload = getCurrentProject(dummyState);
+  expect(Analyzer).toHaveBeenCalledWith(analyzerPayload);
+  const analyzer = new Analyzer(analyzerPayload);
+  expect(validateSource.mock.calls).toEqual([
+    [
+      {
+        language: 'html',
+        source: mockHtmlSource,
+        projectAttributes: analyzer,
+      },
+      dispatch,
+    ],
+    [
+      {
+        language: 'css',
+        source: mockCssSource,
+        projectAttributes: analyzer,
+      },
+      dispatch,
+    ],
+  ]);
+  expect(done).toHaveBeenCalled();
+});
diff --git a/src/logic/__tests__/validateProjectOnChange.test.js b/src/logic/__tests__/validateProjectOnChange.test.js
@@ -0,0 +1,40 @@
+import validateProjectOnChange from '../validateProjectOnChange';
+
+import Analyzer from '../../analyzers';
+import validateSource from '../helpers/validateSource';
+import {getCurrentProject} from '../../selectors';
+
+jest.mock('../../analyzers');
+jest.mock('../helpers/validateSource');
+jest.mock('../../selectors', () => ({
+  getCurrentProject: jest.fn(x => x),
+}));
+
+const dummyState = {};
+
+test('should validate project on change', async () => {
+  const language = 'html';
+  const newValue = 'dummy new value';
+  const dispatch = jest.fn();
+  const done = jest.fn();
+  await validateProjectOnChange.process(
+    {
+      getState: () => dummyState,
+      action: {payload: {language, newValue}},
+    },
+    dispatch,
+    done,
+  );
+  expect(getCurrentProject).toHaveBeenCalledWith(dummyState);
+  const analyzerPayload = getCurrentProject(dummyState);
+  expect(Analyzer).toHaveBeenCalledWith(analyzerPayload);
+  expect(validateSource).toHaveBeenCalledWith(
+    {
+      language,
+      source: newValue,
+      projectAttributes: new Analyzer(getCurrentProject(dummyState)),
+    },
+    dispatch,
+  );
+  expect(done).toHaveBeenCalled();
+});
diff --git a/src/logic/helpers/validateSource.js b/src/logic/helpers/validateSource.js
@@ -0,0 +1,18 @@
+import retryingFailedImports from '../../util/retryingFailedImports';
+import {validatedSource} from '../../actions/errors';
+
+function importValidations() {
+  return retryingFailedImports(() =>
+    import(
+      /* webpackChunkName: "mainAsync" */
+      '../../validations'
+    ),
+  );
+}
+
+export default async ({language, source, projectAttributes}, dispatch) => {
+  const validations = await importValidations();
+  const validate = validations[language];
+  const validationErrors = await validate(source, projectAttributes);
+  await dispatch(validatedSource(language, validationErrors));
+};
diff --git a/src/logic/index.js b/src/logic/index.js
@@ -2,10 +2,14 @@ import linkGithubIdentity from './linkGithubIdentity';
 import logout from './logout';
 import startAccountMigration from './startAccountMigration';
 import unlinkGithubIdentity from './unlinkGithubIdentity';
+import validateCurrentProject from './validateCurrentProject';
+import validateProjectOnChange from './validateProjectOnChange';
 
 export default [
   linkGithubIdentity,
   logout,
   startAccountMigration,
   unlinkGithubIdentity,
+  validateCurrentProject,
+  validateProjectOnChange,
 ];
diff --git a/src/logic/validateCurrentProject.js b/src/logic/validateCurrentProject.js
@@ -0,0 +1,32 @@
+import {createLogic} from 'redux-logic';
+import Analyzer from '../analyzers';
+import {getCurrentProject} from '../selectors';
+import validateSource from './helpers/validateSource';
+
+export default createLogic({
+  type: [
+    'CHANGE_CURRENT_PROJECT',
+    'GIST_IMPORTED',
+    'SNAPSHOT_IMPORTED',
+    'PROJECT_RESTORED_FROM_LAST_SESSION',
+    'TOGGLE_LIBRARY',
+  ],
+  async process({getState}, dispatch, done) {
+    const state = getState();
+    const currentProject = getCurrentProject(state);
+    const analyzer = new Analyzer(currentProject);
+
+    const validatePromises = [];
+    for (const language of Reflect.ownKeys(currentProject.sources)) {
+      const source = currentProject.sources[language];
+      validatePromises.push(
+        validateSource(
+          {language, source, projectAttributes: analyzer},
+          dispatch,
+        ),
+      );
+    }
+    await Promise.all(validatePromises);
+    done();
+  },
+});
diff --git a/src/logic/validateProjectOnChange.js b/src/logic/validateProjectOnChange.js
@@ -0,0 +1,28 @@
+import {createLogic} from 'redux-logic';
+import Analyzer from '../analyzers';
+import {getCurrentProject} from '../selectors';
+import validateSource from './helpers/validateSource';
+
+export default createLogic({
+  type: 'UPDATE_PROJECT_SOURCE',
+  latest: true,
+  async process(
+    {
+      getState,
+      action: {
+        payload: {language, newValue},
+      },
+    },
+    dispatch,
+    done,
+  ) {
+    const state = getState();
+    const analyzer = new Analyzer(getCurrentProject(state));
+
+    await validateSource(
+      {language, source: newValue, projectAttributes: analyzer},
+      dispatch,
+    );
+    done();
+  },
+});
diff --git a/src/sagas/errors.js b/src/sagas/errors.js
diff --git a/src/sagas/index.js b/src/sagas/index.js
@@ -1,7 +1,6 @@
 import {all} from 'redux-saga/effects';
 
 import manageUserState from './manageUserState';
-import watchErrors from './errors';
 import watchProjects from './projects';
 import watchUi from './ui';
 import watchClients from './clients';
@@ -11,7 +10,6 @@ import watchAssignments from './assignments';
 export default function* rootSaga() {
   yield all([
     manageUserState(),
-    watchErrors(),
     watchProjects(),
     watchUi(),
     watchClients(),