diff --git a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_test.go b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_test.go index 4b62817693b..64454b54d17 100644 --- a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_test.go +++ b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_test.go @@ -401,7 +401,7 @@ func Test_DeletedDashboardsNotMigrated(t *testing.T) { // modify what the mock returns for just this test case dashMock := s.dashboardService.(*dashboards.FakeDashboardService) - dashMock.On("GetAllDashboardsByOrgId", mock.Anything).Return( + dashMock.On("GetAllDashboardsByOrgId", mock.Anything, int64(1)).Return( []*dashboards.Dashboard{ {UID: "1", OrgID: 1, Data: simplejson.New()}, {UID: "2", OrgID: 1, Data: simplejson.New(), Deleted: time.Now()}, diff --git a/pkg/services/dashboards/dashboard_service_mock.go b/pkg/services/dashboards/dashboard_service_mock.go index 14d43ac5e7c..5e49ea6ee3e 100644 --- a/pkg/services/dashboards/dashboard_service_mock.go +++ b/pkg/services/dashboards/dashboard_service_mock.go @@ -200,7 +200,7 @@ func (_m *FakeDashboardService) GetAllDashboards(ctx context.Context) ([]*Dashbo func (_m *FakeDashboardService) GetAllDashboardsByOrgId(ctx context.Context, orgID int64) ([]*Dashboard, error) { - ret := _m.Called(ctx) + ret := _m.Called(ctx, orgID) if len(ret) == 0 { panic("no return value specified for GetAllDashboardsByOrgId") diff --git a/pkg/services/dashboards/service/dashboard_service_test.go b/pkg/services/dashboards/service/dashboard_service_test.go index 45f800b950f..5d8c2a67613 100644 --- a/pkg/services/dashboards/service/dashboard_service_test.go +++ b/pkg/services/dashboards/service/dashboard_service_test.go @@ -525,7 +525,7 @@ func TestGetAllDashboardsByOrgId(t *testing.T) { t.Run("Should fallback to dashboard store if Kubernetes feature flags are not enabled", func(t *testing.T) { service.features = featuremgmt.WithFeatures() - fakeStore.On("GetAllDashboardsByOrgId", mock.Anything).Return([]*dashboards.Dashboard{}, nil).Once() + fakeStore.On("GetAllDashboardsByOrgId", mock.Anything, int64(1)).Return([]*dashboards.Dashboard{}, nil).Once() dashboard, err := service.GetAllDashboardsByOrgId(context.Background(), 1) require.NoError(t, err) require.NotNil(t, dashboard) diff --git a/pkg/services/dashboards/store_mock.go b/pkg/services/dashboards/store_mock.go index 29e8399a779..0c8e5b190f7 100644 --- a/pkg/services/dashboards/store_mock.go +++ b/pkg/services/dashboards/store_mock.go @@ -211,7 +211,7 @@ func (_m *FakeDashboardStore) GetAllDashboards(ctx context.Context) ([]*Dashboar // GetAllDashboardsByOrgId provides a mock function with given fields: ctx func (_m *FakeDashboardStore) GetAllDashboardsByOrgId(ctx context.Context, orgID int64) ([]*Dashboard, error) { - ret := _m.Called(ctx) + ret := _m.Called(ctx, orgID) if len(ret) == 0 { panic("no return value specified for GetAllDashboardsByOrgId")