Align tests

Author: geido

superset-frontend/src/components/Chart/ChartContextMenu/useContextMenu.test.tsx

@@ -60,7 +60,12 @@ const setup = ({
       ...mockState,
       user: {
         ...mockState.user,
-        roles: roles ?? { Admin: [['can_explore', 'Superset']] },
+        roles: roles ?? {
+          Admin: [
+            ['can_explore', 'Superset'],
+            ['can_samples', 'Datasource'],
+          ],
+        },
       },
     },
   });
@@ -87,12 +92,27 @@ test('Context menu contains all displayed items only', () => {
   expect(screen.getByText('Drill by')).toBeInTheDocument();
 });
 
-test('Context menu contains all items for can_view_and_drill permission', () => {
+test('Context menu shows all items tied to can_view_and_drill permission', () => {
   const result = setup({
-    roles: { Admin: [['can_view_and_drill', 'Dashboard']] },
+    roles: {
+      Admin: [
+        ['can_view_and_drill', 'Dashboard'],
+        ['can_samples', 'Datasource'],
+      ],
+    },
   });
   result.current.onContextMenu(0, 0, {});
   expect(screen.getByText('Drill to detail')).toBeInTheDocument();
   expect(screen.getByText('Drill by')).toBeInTheDocument();
   expect(screen.getByText('Add cross-filter')).toBeInTheDocument();
 });
+
+test('Context menu does not show "Drill to detail" without proper permissions', () => {
+  const result = setup({
+    roles: { Admin: [['can_view_and_drill', 'Dashboard']] },
+  });
+  result.current.onContextMenu(0, 0, {});
+  expect(screen.queryByText('Drill to detail')).not.toBeInTheDocument();
+  expect(screen.getByText('Drill by')).toBeInTheDocument();
+  expect(screen.getByText('Add cross-filter')).toBeInTheDocument();
+});

superset-frontend/src/components/Chart/DrillDetail/DrillDetailModal.test.tsx

@@ -35,9 +35,16 @@ jest.mock('react-router-dom', () => ({
 
 const { id: chartId, form_data: formData } = chartQueries[sliceId];
 const { slice_name: chartName } = formData;
+const store = getMockStoreWithNativeFilters();
+const drillToDetailModalState = {
+  ...store.getState(),
+  user: {
+    ...store.getState().user,
+    roles: { Admin: [['can_explore', 'Superset']] },
+  },
+};
 
-const renderModal = async () => {
-  const store = getMockStoreWithNativeFilters();
+const renderModal = async (overrideState: Record<string, any> = {}) => {
   const DrillDetailModalWrapper = () => {
     const [showModal, setShowModal] = useState(false);
     return (
@@ -59,7 +66,10 @@ const renderModal = async () => {
   render(<DrillDetailModalWrapper />, {
     useRouter: true,
     useRedux: true,
-    store,
+    initialState: {
+      ...drillToDetailModalState,
+      ...overrideState,
+    },
   });
 
   userEvent.click(screen.getByRole('button', { name: 'Show modal' }));
@@ -93,3 +103,13 @@ test('should forward to Explore', async () => {
     `/explore/?dashboard_page_id=&slice_id=${sliceId}`,
   );
 });
+
+test('should render "Edit chart" as disabled without can_explore permission', async () => {
+  await renderModal({
+    user: {
+      ...drillToDetailModalState.user,
+      roles: { Admin: [['test_invalid_role', 'Superset']] },
+    },
+  });
+  expect(screen.getByRole('button', { name: 'Edit chart' })).toBeDisabled();
+});

superset-frontend/src/dashboard/components/SliceHeaderControls/SliceHeaderControls.test.tsx

@@ -305,18 +305,23 @@ test('Drill to detail modal is under featureflag', () => {
   expect(screen.queryByText('Drill to detail')).not.toBeInTheDocument();
 });
 
-test('Should show the "Drill to detail"', () => {
+test('Should show "Drill to detail"', () => {
   // @ts-ignore
   global.featureFlags = {
     [FeatureFlag.DRILL_TO_DETAIL]: true,
   };
   const props = createProps();
   props.slice.slice_id = 18;
-  renderWrapper(props);
+  renderWrapper(props, {
+    Admin: [
+      ['can_view_and_drill', 'Dashboard'],
+      ['can_samples', 'Datasource'],
+    ],
+  });
   expect(screen.getByText('Drill to detail')).toBeInTheDocument();
 });
 
-test('Should show the can_view_and_drill permission related items', () => {
+test('Should show menu items tied to can_view_and_drill permission', () => {
   // @ts-ignore
   global.featureFlags = {
     [FeatureFlag.DRILL_TO_DETAIL]: true,
@@ -331,10 +336,10 @@ test('Should show the can_view_and_drill permission related items', () => {
   });
   expect(screen.getByText('View query')).toBeInTheDocument();
   expect(screen.getByText('View as table')).toBeInTheDocument();
-  expect(screen.getByText('Drill to detail')).toBeInTheDocument();
+  expect(screen.queryByText('Drill to detail')).not.toBeInTheDocument();
 });
 
-test('Should not show the "Edit chart" with can_view_and_drill permission', () => {
+test('Should not show the "Edit chart" without proper permissions', () => {
   const props = {
     ...createProps(),
     supersetCanExplore: false,