Skip to content

Commit

Permalink
chore(lint): apply @spinnaker/import-sort rule against typescript tests
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherthielen authored and mergify[bot] committed Oct 6, 2021
1 parent 696e4c8 commit f291016
Show file tree
Hide file tree
Showing 160 changed files with 389 additions and 354 deletions.
4 changes: 2 additions & 2 deletions packages/amazon/src/function/details/FunctionActions.spec.tsx
@@ -1,11 +1,11 @@
import React from 'react';
import { shallow } from 'enzyme';
import React from 'react';

import type { Application } from '@spinnaker/core';

import { AWSProviderSettings } from '../../aws.settings';
import type { IAmazonFunction } from '../../index';
import { FunctionActions } from '../../index';
import { AWSProviderSettings } from '../../aws.settings';

describe('FunctionActions', () => {
it('should render correct state when all attributes exist', () => {
Expand Down
@@ -1,5 +1,6 @@
import React from 'react';
import { shallow } from 'enzyme';
import React from 'react';

import { mockInstance } from '@spinnaker/mocks';

import { InstanceInformation } from './InstanceInformation';
Expand Down
@@ -1,6 +1,6 @@
import type { StateService } from '@uirouter/core';
import type { IControllerService, IRootScopeService } from 'angular';
import { mock } from 'angular';
import type { StateService } from '@uirouter/core';

import type { ISubnet } from '@spinnaker/core';
import { ApplicationModelBuilder } from '@spinnaker/core';
Expand Down
@@ -1,16 +1,16 @@
import React from 'react';
// eslint-disable-next-line @spinnaker/import-from-npm-not-relative
import { mockHttpClient } from '../../../../core/src/api/mock/jasmine';
import { mock } from 'angular';
import type { ShallowWrapper, ReactWrapper } from 'enzyme';
import { shallow, mount } from 'enzyme';
import type { ReactWrapper, ShallowWrapper } from 'enzyme';
import { mount, shallow } from 'enzyme';
import React from 'react';

import type { IAmazonImage } from '../../image';
import { Application } from '@spinnaker/core';
import { REACT_MODULE } from '@spinnaker/core';

import type { IAmazonImageSelectorProps, IAmazonImageSelectorState } from './AmazonImageSelectInput';
import { AmazonImageSelectInput } from './AmazonImageSelectInput';
// eslint-disable-next-line @spinnaker/import-from-npm-not-relative
import { mockHttpClient } from '../../../../core/src/api/mock/jasmine';
import type { IAmazonImage } from '../../image';
const application = new Application('testapp', null, []);
const region = 'us-region-1';
const credentials = 'prodaccount';
Expand Down
@@ -1,4 +1,4 @@
import type { IQService, IScope, IRootScopeService } from 'angular';
import type { IQService, IRootScopeService, IScope } from 'angular';
import { mock } from 'angular';

import type { CacheInitializerService, LoadBalancerReader, SecurityGroupReader } from '@spinnaker/core';
Expand Down
@@ -1,6 +1,5 @@
import type { IAmazonAsg, IAmazonServerGroup } from '../../../domain';

import { AutoScalingProcessService } from './AutoScalingProcessService';
import type { IAmazonAsg, IAmazonServerGroup } from '../../../domain';

describe('AutoScalingProcessService', () => {
describe('normalizeScalingProcesses', () => {
Expand Down
@@ -1,10 +1,12 @@
import React from 'react';
import { shallow } from 'enzyme';
import React from 'react';

import type { Application } from '@spinnaker/core';
import { ApplicationModelBuilder } from '@spinnaker/core';
import { mockLaunchTemplate, mockServerGroup } from '@spinnaker/mocks';

import type { IAmazonMixedInstancesPolicy, IAmazonServerGroupView, IScalingPolicy } from '../../../domain';
import { InstancesDistributionDetailsSection } from '../../../index';
import type { Application } from '@spinnaker/core';
import { ApplicationModelBuilder } from '@spinnaker/core';

describe('InstancesDistribution', () => {
let app: Application;
Expand Down
@@ -1,16 +1,18 @@
import React from 'react';
import { shallow } from 'enzyme';
import React from 'react';

import type { Application } from '@spinnaker/core';
import { ApplicationModelBuilder } from '@spinnaker/core';
import {
createCustomMockLaunchTemplate,
mockLaunchTemplate,
mockLaunchTemplateData,
mockServerGroup,
} from '@spinnaker/mocks';
import type { Application } from '@spinnaker/core';
import { ApplicationModelBuilder } from '@spinnaker/core';
import type { IAmazonServerGroupView, IAmazonMixedInstancesPolicy, IScalingPolicy } from '../../../domain';

import { LaunchTemplateDetailsSection } from './LaunchTemplateDetailsSection';
import { MultipleInstanceTypesSubSection } from './MultipleInstanceTypesSubSection';
import type { IAmazonMixedInstancesPolicy, IAmazonServerGroupView, IScalingPolicy } from '../../../domain';

describe('Launch template details', () => {
let app: Application;
Expand Down
@@ -1,9 +1,9 @@
import type { IQService, IRootScopeService, IScope } from 'angular';
import { mock } from 'angular';

import type { IAmazonServerGroup, IScalingPolicyAlarmView, IStepAdjustment } from '../domain';
import type { AwsServerGroupTransformer } from './serverGroup.transformer';
import { AWS_SERVER_GROUP_TRANSFORMER } from './serverGroup.transformer';
import type { IScalingPolicyAlarmView, IAmazonServerGroup, IStepAdjustment } from '../domain';
import { VpcReader } from '../vpc/VpcReader';

describe('awsServerGroupTransformer', () => {
Expand Down
8 changes: 5 additions & 3 deletions packages/amazon/src/subnet/SubnetSelectInput.spec.tsx
@@ -1,11 +1,13 @@
import React from 'react';
import { shallow, render } from 'enzyme';
import { mock } from 'angular';
import { SubnetSelectInput } from './SubnetSelectInput';
import { render, shallow } from 'enzyme';
import React from 'react';

import type { Application } from '@spinnaker/core';
import { ApplicationModelBuilder } from '@spinnaker/core';
import { mockServerGroupDataSourceConfig, mockSubnet } from '@spinnaker/mocks';

import { SubnetSelectInput } from './SubnetSelectInput';

describe('SubnetSelectInput', () => {
let application: Application;

Expand Down
3 changes: 2 additions & 1 deletion packages/amazon/src/vpc/VpcTag.spec.tsx
@@ -1,7 +1,8 @@
import { mount } from 'enzyme';
import React from 'react';
import { VpcReader } from '../vpc/VpcReader';

import { VpcTag } from './VpcTag';
import { VpcReader } from '../vpc/VpcReader';

const tick = () => new Promise((resolve) => setTimeout(resolve));

Expand Down
@@ -1,12 +1,13 @@
import React from 'react';
// eslint-disable-next-line @spinnaker/import-from-npm-not-relative
import { mockHttpClient } from '../../../../../core/src/api/mock/jasmine';
import { mount } from 'enzyme';
import React from 'react';

import type { IArtifactAccount, IArtifactAccountPair } from '@spinnaker/core';
import { StageArtifactSelector } from '@spinnaker/core';
import { mockDeployStage, mockPipeline } from '@spinnaker/mocks';

import { ConfigFileArtifactList } from './ConfigFileArtifactList';
// eslint-disable-next-line @spinnaker/import-from-npm-not-relative
import { mockHttpClient } from '../../../../../core/src/api/mock/jasmine';

describe('<ConfigFileArtifactList/>', () => {
it('renders empty children when null/empty artifacts are passed in', () => {
Expand Down
@@ -1,10 +1,11 @@
import React from 'react';
import { mock } from 'angular';
import type { IStage } from 'core';
import { ApplicationModelBuilder, REACT_MODULE, SpinFormik, StageConfigField } from 'core';
import { mount } from 'enzyme';
import React from 'react';

import { mockServerGroupDataSourceConfig } from '@spinnaker/mocks';
import type { IStage } from 'core';
import { ApplicationModelBuilder, REACT_MODULE, SpinFormik, StageConfigField } from 'core';

import { CloudFoundryCreateServiceBindingsStageConfigForm } from './CloudFoundryCreateServiceBindingsStageConfigForm';

describe('<CloudFoundryCreateServiceBindingsStageConfigForm/>', function () {
Expand Down
@@ -1,10 +1,11 @@
import React from 'react';
import { mock } from 'angular';
import { mount } from 'enzyme';
import React from 'react';

import { mockServerGroupDataSourceConfig } from '@spinnaker/mocks';
import type { IStage } from '@spinnaker/core';
import { ApplicationModelBuilder, REACT_MODULE, SpinFormik, StageConfigField } from '@spinnaker/core';
import { mockServerGroupDataSourceConfig } from '@spinnaker/mocks';

import { CloudFoundryDeleteServiceBindingsStageConfigForm } from './CloudFoundryDeleteServiceBindingsStageConfigForm';

describe('<CloudFoundryDeleteServiceBindingsStageConfigForm/>', function () {
Expand Down
@@ -1,7 +1,7 @@
import React from 'react';
import type { IScope } from 'angular';
import { mock, noop } from 'angular';
import { mount, shallow } from 'enzyme';
import React from 'react';

import type { Application, ApplicationDataSource, IMoniker, IServerGroup } from '@spinnaker/core';
import { ApplicationModelBuilder, REACT_MODULE } from '@spinnaker/core';
Expand Down
11 changes: 6 additions & 5 deletions packages/core/src/account/AccountSelectInput.spec.tsx
@@ -1,12 +1,13 @@
import React from 'react';
import type { ShallowWrapper } from 'enzyme';
import { shallow } from 'enzyme';
import type { IScope } from 'angular';
import { mock } from 'angular';
import type { IAccountDetails } from './AccountService';
import { AccountService } from './AccountService';
import type { ShallowWrapper } from 'enzyme';
import { shallow } from 'enzyme';
import React from 'react';

import type { IAccountSelectInputProps, IAccountSelectInputState } from './AccountSelectInput';
import { AccountSelectInput } from './AccountSelectInput';
import type { IAccountDetails } from './AccountService';
import { AccountService } from './AccountService';
import Spy = jasmine.Spy;

const makeAccount = (name: string, cloudProvider: string, primaryAccount: boolean): IAccountDetails => {
Expand Down
9 changes: 4 additions & 5 deletions packages/core/src/account/AccountService.spec.ts
@@ -1,13 +1,12 @@
import { mock } from 'angular';
import { mockHttpClient } from '../api/mock/jasmine';
import type { MockHttpClient } from '../api/mock/mockHttpClient';

import { SETTINGS } from '../config/settings';
import { $rootScope } from 'ngimport';
import { CloudProviderRegistry } from '../cloudProvider';

import type { IAccount } from './AccountService';
import { AccountService } from './AccountService';
import { mockHttpClient } from '../api/mock/jasmine';
import type { MockHttpClient } from '../api/mock/mockHttpClient';
import { CloudProviderRegistry } from '../cloudProvider';
import { SETTINGS } from '../config/settings';

function flush<T>(http: MockHttpClient, promise: PromiseLike<T>): Promise<T> {
return http
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/api/ApiService.spec.ts
@@ -1,6 +1,6 @@
import type { IHttpClientImplementation } from './ApiService';
import { SETTINGS } from '../config/settings';
import { makeRequestBuilderConfig, RequestBuilder } from './ApiService';
import { SETTINGS } from '../config/settings';

describe('RequestBuilder backend', () => {
const createBackend = (): IHttpClientImplementation => jasmine.createSpyObj(['get', 'post', 'put', 'delete']);
Expand Down
3 changes: 2 additions & 1 deletion packages/core/src/api/ApiServiceDeprecated.spec.ts
Expand Up @@ -2,9 +2,10 @@

import Spy = jasmine.Spy;
import { mock, noop } from 'angular';

import { API, InvalidAPIResponse, invalidContentMessage } from './ApiService';
import { AuthenticationInitializer } from '../authentication/AuthenticationInitializer';
import type { ICache } from '../cache';
import { API, InvalidAPIResponse, invalidContentMessage } from './ApiService';
import { SETTINGS } from '../config/settings';

describe('API Service', function () {
Expand Down
7 changes: 3 additions & 4 deletions packages/core/src/application/application.model.spec.ts
Expand Up @@ -2,13 +2,12 @@ import { mock } from 'angular';

import type { Application } from './application.model';
import { ApplicationModelBuilder } from './applicationModel.builder';
import { ApplicationDataSourceRegistry } from './service/ApplicationDataSourceRegistry';
import type { IEntityTag, IEntityTags, IInstanceCounts, ILoadBalancer, IServerGroup } from '../domain';
import { LOAD_BALANCER_DATA_SOURCE } from '../loadBalancer/loadBalancer.dataSource';
import { SECURITY_GROUP_DATA_SOURCE } from '../securityGroup/securityGroup.dataSource';
import type { SecurityGroupReader } from '../securityGroup/securityGroupReader.service';
import { SERVER_GROUP_DATA_SOURCE } from '../serverGroup/serverGroup.dataSource';
import { SECURITY_GROUP_DATA_SOURCE } from '../securityGroup/securityGroup.dataSource';

import type { IEntityTag, IEntityTags, IServerGroup, IInstanceCounts, ILoadBalancer } from '../domain';
import { ApplicationDataSourceRegistry } from './service/ApplicationDataSourceRegistry';

describe('Application Model', function () {
let application: Application,
Expand Down
@@ -1,10 +1,9 @@
import React from 'react';
import { shallow } from 'enzyme';

import { noop } from '../../../utils';
import React from 'react';

import type { ICustomBannerConfig } from './CustomBannerConfig';
import { CustomBannerConfig } from './CustomBannerConfig';
import { noop } from '../../../utils';

describe('<CustomBannerConfig />', () => {
let bannerConfigs: ICustomBannerConfig[];
Expand Down
@@ -1,11 +1,11 @@
import { mock } from 'angular';

import type { Application } from '../../application.model';
import { ApplicationModelBuilder } from '../../applicationModel.builder';
import type { DataSourceEditorController } from './applicationDataSourceEditor.component';
import { APPLICATION_DATA_SOURCE_EDITOR } from './applicationDataSourceEditor.component';
import { ApplicationWriter } from '../../service/ApplicationWriter';
import { ApplicationModelBuilder } from '../../applicationModel.builder';
import { TaskReader } from '../../../index';
import { ApplicationWriter } from '../../service/ApplicationWriter';

describe('Component: Application Data Source Editor', () => {
let application: Application,
Expand Down
@@ -1,8 +1,8 @@
import { mock } from 'angular';

import { ApplicationWriter } from '../../service/ApplicationWriter';
import type { ConfigSectionFooterController } from './configSectionFooter.component';
import { CONFIG_SECTION_FOOTER } from './configSectionFooter.component';
import { ApplicationWriter } from '../../service/ApplicationWriter';

describe('Component: ConfigSectionFooter', () => {
let $componentController: ng.IComponentControllerService,
Expand Down
@@ -1,7 +1,7 @@
import type { IInstance, IServerGroup } from '../../domain';
import { AppListExtractor } from './AppListExtractor';
import type { Application } from '../application.model';
import { ApplicationModelBuilder } from '../applicationModel.builder';
import { AppListExtractor } from './AppListExtractor';
import type { IInstance, IServerGroup } from '../../domain';
import type { IMoniker } from '../../naming/IMoniker';

describe('AppListExtractor', function () {
Expand Down
@@ -1,11 +1,11 @@
import React from 'react';
import { mock } from 'angular';
import { mount } from 'enzyme';
import React from 'react';

import { AuthenticationService } from '../../authentication';
import { REACT_MODULE } from '../../reactShims';
import type { IPermissions, IPermissionsConfigurerProps } from './PermissionsConfigurer';
import { PermissionsConfigurer } from './PermissionsConfigurer';
import { AuthenticationService } from '../../authentication';
import { REACT_MODULE } from '../../reactShims';

describe('PermissionsConfigurer', () => {
const createComponent = (props: IPermissionsConfigurerProps) => {
Expand Down
Expand Up @@ -2,8 +2,8 @@ import type { ICompileService, IQService, IRootScopeService } from 'angular';
import { mock } from 'angular';

import { ExampleApplicationNameValidator, ExampleApplicationNameValidator2 } from './ExampleApplicationNameValidator';
import { VALIDATE_APPLICATION_NAME } from './validateApplicationName.directive';
import { AccountService } from '../../../account/AccountService';
import { VALIDATE_APPLICATION_NAME } from './validateApplicationName.directive';

describe('Validator: validateApplicationName', function () {
const validator1 = new ExampleApplicationNameValidator();
Expand Down
24 changes: 12 additions & 12 deletions packages/core/src/application/nav/ApplicationNavigation.spec.tsx
@@ -1,26 +1,26 @@
import React from 'react';
import { RecoilRoot } from 'recoil';
import { mount } from 'enzyme';
import { mock } from 'angular';
import { StateMatcher } from '@uirouter/core';
import type { UIRouterReact } from '@uirouter/react';
import { UIRouterContext } from '@uirouter/react';
import { StateMatcher } from '@uirouter/core';
import { mock } from 'angular';
import { mount } from 'enzyme';
import React from 'react';
import { RecoilRoot } from 'recoil';

import { REACT_MODULE } from '../../reactShims';
import { OVERRIDE_REGISTRY } from '../../overrideRegistry';
import {
mockAppConfigDataSourceConfig,
mockServerGroupDataSourceConfig,
mockLoadBalancerDataSourceConfig,
mockTaskDataSourceConfig,
mockPipelineDataSourceConfig,
mockServerGroupDataSourceConfig,
mockTaskDataSourceConfig,
} from '@spinnaker/mocks';
import { ApplicationModelBuilder } from '../../application';
import type { IPipeline } from '../../domain';
import type { ApplicationDataSource } from '../service/applicationDataSource';

import { ApplicationNavigation } from './ApplicationNavigation';
import { ApplicationModelBuilder } from '../../application';
import { SETTINGS } from '../../config';
import type { IPipeline } from '../../domain';
import { OVERRIDE_REGISTRY } from '../../overrideRegistry';
import { REACT_MODULE } from '../../reactShims';
import type { ApplicationDataSource } from '../service/applicationDataSource';

describe('ApplicationNavigation', () => {
let $uiRouter: UIRouterReact;
Expand Down

0 comments on commit f291016

Please sign in to comment.