Merge pull request opossum-tool#2056 from benedikt-richter/add_featur…

…e_flag Add feature flag
vasily-pozdnyakov · Sep 27, 2023 · cbc7074 · cbc7074
2 parents 9fb2bb8 + 1882d0c
commit cbc7074
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/Frontend/integration-tests/audit-view-tests/__tests__/audit-view.test.tsx b/src/Frontend/integration-tests/audit-view-tests/__tests__/audit-view.test.tsx
@@ -575,7 +575,7 @@ describe('The App in Audit View', () => {
     );
   });
 
-  it('preferred button is shown and sets an attribution as preferred', () => {
+  it.skip('preferred button is shown and sets an attribution as preferred', () => {
     function getExpectedSaveFileArgs(
       preferred: boolean,
       preferredOverOriginIds?: Array<string>,
@@ -673,7 +673,7 @@ describe('The App in Audit View', () => {
     expect(window.electronAPI.saveFile).toHaveBeenCalledTimes(2);
   });
 
-  it('after setting an attribution to preferred, global save is disabled', () => {
+  it.skip('after setting an attribution to preferred, global save is disabled', () => {
     const testResources: Resources = {
       file: 1,
       other_file: 1,

diff --git a/src/Frontend/state/actions/resource-actions/__tests__/load-actions.test.ts b/src/Frontend/state/actions/resource-actions/__tests__/load-actions.test.ts
@@ -231,7 +231,7 @@ describe('loadFromFile', () => {
     expect(getExternalAttributionsToHashes(testStore.getState())).toEqual(
       expectedExternalAttributionsToHashes,
     );
-    expect(getIsPreferenceFeatureEnabled(testStore.getState())).toEqual(true);
+    expect(getIsPreferenceFeatureEnabled(testStore.getState())).toEqual(false);
   });
 
   it('disables the preference feature if no external source is relevant', () => {

diff --git a/src/Frontend/state/actions/resource-actions/load-actions.ts b/src/Frontend/state/actions/resource-actions/load-actions.ts
@@ -8,12 +8,12 @@ import { AppThunkAction, AppThunkDispatch } from '../../types';
 import {
   setAttributionBreakpoints,
   setBaseUrlsForSources,
-  setIsPreferenceFeatureEnabled,
   setExternalAttributionSources,
   setExternalAttributionsToHashes,
   setExternalData,
   setFilesWithChildren,
   setFrequentLicenses,
+  setIsPreferenceFeatureEnabled,
   setManualData,
   setProjectMetadata,
   setResources,
@@ -67,6 +67,12 @@ export function loadFromFile(
       setIsPreferenceFeatureEnabled(fileContainsSourcesRelevantForPreferred),
     );
 
+    // Feature flag
+    // when removing unskip the following tests
+    // * after setting an attribution to preferred, global save is disabled
+    // * preferred button is shown and sets an attribution as preferred
+    dispatch(setIsPreferenceFeatureEnabled(false));
+
     parsedFileContent.resolvedExternalAttributions.forEach((attribution) =>
       dispatch(addResolvedExternalAttribution(attribution)),
     );