Skip to content

Commit

Permalink
chore(*): bump @types/enzyme@3.1.15, @types/jasmine@3.3.7, enzyme@3.8…
Browse files Browse the repository at this point in the history
….0, enzyme-adapter-react-16@1.7.1, karma@4.0.0, karma-jasmine@2.0.1, karma-webpack@3.0.5, typescript@^3.2.4, jasmine-core@3.3.0

- disable jasmine 3.0's random test order by default feature
  • Loading branch information
christopherthielen committed Jan 24, 2019
1 parent 1824eb2 commit 98a85e9
Show file tree
Hide file tree
Showing 5 changed files with 335 additions and 859 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ describe('<AccountRegionClusterSelector />', () => {
},
};

const component = shallow(<AccountRegionClusterSelector {...accountRegionClusterProps} />);
const component = shallow<AccountRegionClusterSelector>(
<AccountRegionClusterSelector {...accountRegionClusterProps} />,
);
$scope.$digest();

expect(component.state().availableRegions.length).toBe(2, 'number of available regions do not match');
Expand Down Expand Up @@ -104,7 +106,9 @@ describe('<AccountRegionClusterSelector />', () => {
},
};

const component = mount(<AccountRegionClusterSelector {...accountRegionClusterProps} />);
const component = mount<AccountRegionClusterSelector>(
<AccountRegionClusterSelector {...accountRegionClusterProps} />,
);
$scope.$digest();

expect(component.state().availableRegions.length).toBe(2, 'number of available regions do not match');
Expand Down Expand Up @@ -156,7 +160,9 @@ describe('<AccountRegionClusterSelector />', () => {
},
};

const component = mount(<AccountRegionClusterSelector {...accountRegionClusterProps} />);
const component = mount<AccountRegionClusterSelector>(
<AccountRegionClusterSelector {...accountRegionClusterProps} />,
);
$scope.$digest();

expect(component.state().availableRegions.length).toBe(2, 'number of available regions do not match');
Expand Down Expand Up @@ -211,7 +217,9 @@ describe('<AccountRegionClusterSelector />', () => {
},
};

const component = mount(<AccountRegionClusterSelector {...accountRegionClusterProps} />);
const component = mount<AccountRegionClusterSelector>(
<AccountRegionClusterSelector {...accountRegionClusterProps} />,
);
$scope.$digest();

expect(component.state().availableRegions.length).toBe(2, 'number of available regions do not match');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
} from '@spinnaker/core';

import { ManifestKindSearchService } from 'kubernetes/v2/manifest/ManifestKindSearch';
import { ManifestSelector } from 'kubernetes/v2/manifest/selector/ManifestSelector';
import { ManifestSelector, IManifestSelectorState } from 'kubernetes/v2/manifest/selector/ManifestSelector';
import { SelectorMode } from 'kubernetes/v2/manifest/selector/IManifestSelector';

describe('<ManifestSelector />', () => {
Expand Down Expand Up @@ -274,7 +274,7 @@ describe('<ManifestSelector />', () => {
{ name: 'my-account', namespaces: ['default'] },
{ name: 'my-other-account', namespaces: ['default'] },
],
});
} as IManifestSelectorState);

const account = wrapper.find(AccountSelectInput).first();
account.props().onChange(createFakeReactSyntheticEvent({ value: 'my-other-account' }));
Expand All @@ -292,7 +292,7 @@ describe('<ManifestSelector />', () => {
{ name: 'my-account', namespaces: ['default'] },
{ name: 'my-other-account', namespaces: ['other-default'] },
],
});
} as IManifestSelectorState);

const account = wrapper.find(AccountSelectInput).first();
account.props().onChange(createFakeReactSyntheticEvent({ value: 'my-other-account' }));
Expand Down Expand Up @@ -342,4 +342,4 @@ describe('<ManifestSelector />', () => {
});

const component = (selector: any, props: any = {}) =>
mount(<ManifestSelector onChange={noop} selector={selector} {...props} /> as any);
mount<ManifestSelector>(<ManifestSelector onChange={noop} selector={selector} {...props} /> as any);
3 changes: 3 additions & 0 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ module.exports = function(config) {

client: {
captureConsole: true,
jasmine: {
random: false,
},
},

browserNoActivityTimeout: 200000,
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@
"@types/commonmark": "^0.27.0",
"@types/d3": "^5.0.0",
"@types/dompurify": "^0.0.29",
"@types/enzyme": "^3.1.10",
"@types/jasmine": "2.5.47",
"@types/enzyme": "^3.1.15",
"@types/jasmine": "3.3.7",
"@types/jquery": "^2.0.34",
"@types/jqueryui": "^1.11.32",
"@types/js-yaml": "3.5.30",
Expand Down Expand Up @@ -137,8 +137,8 @@
"cssnano": "^3.10.0",
"envify": "^4.1.0",
"envify-loader": "^0.1.0",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "1.6.0",
"enzyme": "^3.8.0",
"enzyme-adapter-react-16": "1.7.1",
"eslint": "^3.17.0",
"eslint-loader": "^2.0.0",
"exports-loader": "^0.7.0",
Expand All @@ -150,15 +150,15 @@
"husky": "^0.14.3",
"imports-loader": "^0.8.0",
"istanbul-instrumenter-loader": "^3.0.0",
"jasmine-core": "2.99.1",
"karma": "2.0.4",
"jasmine-core": "3.3.0",
"karma": "4.0.0",
"karma-chrome-launcher": "=2.2.0",
"karma-jasmine": "=1.1.1",
"karma-jasmine": "2.0.1",
"karma-junit-reporter": "^1.1.0",
"karma-mocha-reporter": "^2.2.5",
"karma-sourcemap-loader": "=0.3.7",
"karma-super-dots-reporter": "^0.2.0",
"karma-webpack": "=2.0.13",
"karma-webpack": "3.0.5",
"less": "^2.7.2",
"less-loader": "4.1.0",
"loader-utils": "^1.1.0",
Expand All @@ -185,7 +185,7 @@
"tslint-eslint-rules": "^5.3.1",
"tslint-loader": "^3.6.0",
"tslint-react": "^3.6.0",
"typescript": "^3.0.1",
"typescript": "^3.2.4",
"uglifyjs-webpack-plugin": "^1.2.4",
"url-loader": "^1.0.1",
"wait-on": "^3.2.0",
Expand Down
Loading

0 comments on commit 98a85e9

Please sign in to comment.