Skip to content

Make sorting tests work with remote queries & variant analysis history items #1710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elenatanasoiu merged 10 commits into from
Nov 3, 2022
Merged

Make sorting tests work with remote queries & variant analysis history items #1710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
304c9fb
Change createMockVariantAnalysis to receive named params
elenatanasoiu Nov 3, 2022
dd55b7e
Change createMockVariantAnalysis calls to use named params
elenatanasoiu Nov 3, 2022
44aeaf7
Allow createMockVariantAnalysisHistoryItem to receive named params
elenatanasoiu Nov 3, 2022
0639c66
Change createMockRemoteQueryHistoryItem to receive resultCount and st…
elenatanasoiu Nov 3, 2022
028cc79
Combine createMockLocalQueryInfo and createMockLocalQuery
elenatanasoiu Nov 3, 2022
2fe0c79
Adapt tests for query history labels to use new LocalQueryInfo factor…
elenatanasoiu Nov 3, 2022
a1d3c61
Use new createMockLocalQueryInfo method in query-history-info tests
elenatanasoiu Nov 3, 2022
a7431bd
Use new factory methods in query history tests
elenatanasoiu Nov 3, 2022
52ee456
Make sorting tests work with remote queries and variant analysis hist…
elenatanasoiu Nov 3, 2022
f0aa0a5
Get rid of old `item` factory method
elenatanasoiu Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysis.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const Template: ComponentStory<typeof VariantAnalysisComponent> = (args) => (
);

const variantAnalysis: VariantAnalysisDomainModel = {
...createMockVariantAnalysis(VariantAnalysisStatus.InProgress),
...createMockVariantAnalysis({ status: VariantAnalysisStatus.InProgress }),
controllerRepo: {
id: 1,
fullName: 'octodemo/variant-analysis-controller',
Expand Down
107 changes: 55 additions & 52 deletions extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisAnalyzedRepos.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,64 +36,67 @@ const interpretedResultsForRepo = (nwo: string): AnalysisAlert[] | undefined =>

export const Example = Template.bind({});
Example.args = {
variantAnalysis: createMockVariantAnalysis(VariantAnalysisStatus.InProgress, [
{
repository: {
...createMockRepositoryWithMetadata(),
id: 63537249,
fullName: 'facebook/create-react-app',
private: false,
variantAnalysis: createMockVariantAnalysis({
status: VariantAnalysisStatus.InProgress,
scannedRepos: [
{
repository: {
...createMockRepositoryWithMetadata(),
id: 63537249,
fullName: 'facebook/create-react-app',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.Succeeded, resultCount: 198,
},
analysisStatus: VariantAnalysisRepoStatus.Succeeded, resultCount: 198,
},
{
repository: {
...createMockRepositoryWithMetadata(),
id: 167174,
fullName: 'jquery/jquery',
private: false,
{
repository: {
...createMockRepositoryWithMetadata(),
id: 167174,
fullName: 'jquery/jquery',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 67,
},
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 67,
},
{
repository: {
...createMockRepositoryWithMetadata(),
id: 237159,
fullName: 'expressjs/express',
private: false,
{
repository: {
...createMockRepositoryWithMetadata(),
id: 237159,
fullName: 'expressjs/express',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 26,
},
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 26,
},
{
repository: {
...createMockRepositoryWithMetadata(),
id: 15062869,
fullName: 'facebook/jest',
private: false,
{
repository: {
...createMockRepositoryWithMetadata(),
id: 15062869,
fullName: 'facebook/jest',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.Failed,
},
analysisStatus: VariantAnalysisRepoStatus.Failed,
},
{
repository: {
...createMockRepositoryWithMetadata(),
id: 24195339,
fullName: 'angular/angular',
private: false,
{
repository: {
...createMockRepositoryWithMetadata(),
id: 24195339,
fullName: 'angular/angular',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.InProgress,
},
analysisStatus: VariantAnalysisRepoStatus.InProgress,
},
{
repository: {
...createMockRepositoryWithMetadata(),
id: 24560307,
fullName: 'babel/babel',
private: false,
{
repository: {
...createMockRepositoryWithMetadata(),
id: 24560307,
fullName: 'babel/babel',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.Pending,
},
analysisStatus: VariantAnalysisRepoStatus.Pending,
},
]),
]
}),
repositoryResults: [
{
variantAnalysisId: 1,
Expand Down
68 changes: 39 additions & 29 deletions extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisHeader.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,40 +64,46 @@ const Template: ComponentStory<typeof VariantAnalysisHeader> = (args) => (

export const InProgress = Template.bind({});
InProgress.args = {
variantAnalysis: createMockVariantAnalysis(VariantAnalysisStatus.InProgress, [
{
...createMockScannedRepo(),
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 99_999,
},
{
...createMockScannedRepo(),
analysisStatus: VariantAnalysisRepoStatus.Failed,
},
{
...createMockScannedRepo(),
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 0,
},
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
]),
variantAnalysis: createMockVariantAnalysis({
status: VariantAnalysisStatus.InProgress,
scannedRepos: [
{
...createMockScannedRepo(),
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 99_999,
},
{
...createMockScannedRepo(),
analysisStatus: VariantAnalysisRepoStatus.Failed,
},
{
...createMockScannedRepo(),
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 0,
},
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
]
}),
};

export const Succeeded = Template.bind({});
Succeeded.args = {
...InProgress.args,
variantAnalysis: {
...createMockVariantAnalysis(VariantAnalysisStatus.Succeeded, Array.from({ length: 1000 }, (_) => ({
...createMockScannedRepo(),
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 100,
}))),
...createMockVariantAnalysis({
status: VariantAnalysisStatus.Succeeded,
scannedRepos: Array.from({ length: 1000 }, (_) => ({
...createMockScannedRepo(),
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 100,
}))
}),
createdAt: new Date(1661262726000).toISOString(),
completedAt: new Date(1661263446000).toISOString(),
},
Expand All @@ -107,7 +113,11 @@ export const Failed = Template.bind({});
Failed.args = {
...InProgress.args,
variantAnalysis: {
...createMockVariantAnalysis(VariantAnalysisStatus.Failed, [], {}),
...createMockVariantAnalysis({
status: VariantAnalysisStatus.Failed,
scannedRepos: [],
skippedRepos: {}
}),
createdAt: new Date(1661263436000).toISOString(),
completedAt: new Date(1661263446000).toISOString(),
},
Expand Down
Loading