diff --git a/db/migrate/20200204230135_add_show_zones_to_web_app_config.rb b/db/migrate/20200204230135_add_show_zones_to_web_app_config.rb new file mode 100644 index 000000000..f4a23279b --- /dev/null +++ b/db/migrate/20200204230135_add_show_zones_to_web_app_config.rb @@ -0,0 +1,8 @@ +class AddShowZonesToWebAppConfig < ActiveRecord::Migration[6.0] + def change + add_column :web_app_configs, + :show_zones, + :boolean, + default: false + end +end diff --git a/frontend/__test_support__/additional_mocks.ts b/frontend/__test_support__/additional_mocks.tsx similarity index 73% rename from frontend/__test_support__/additional_mocks.ts rename to frontend/__test_support__/additional_mocks.tsx index 6d80eed8a..6b2b3046d 100644 --- a/frontend/__test_support__/additional_mocks.ts +++ b/frontend/__test_support__/additional_mocks.tsx @@ -1,3 +1,5 @@ +import * as React from "react"; + jest.mock("browser-speech", () => ({ talk: jest.fn(), })); @@ -16,3 +18,8 @@ window.location = { pathname: "", href: "", hash: "", search: "", hostname: "", origin: "", port: "", protocol: "", host: "", }; + +jest.mock("../error_boundary", () => ({ + // tslint:disable-next-line:no-any + ErrorBoundary: (p: any) =>