Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ module.exports = {
],
moduleDirectories: [
`${foremanFull}/node_modules`,
`${foremanFull}/node_modules/@theforeman/vendor-core/node_modules`,
'node_modules',
'webpack/test-utils',
],
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
"nock": "^12.0.3",
"react-test-renderer": "^16.0.0"
},
"_comment": "We don't include @theforeman/vendor because it's assumed to be present in Foreman",
"dependencies": {
"angular": "1.8.2",
"bootstrap-select": "1.13.18",
Expand Down
4 changes: 1 addition & 3 deletions webpack/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
const path = require('path');
const { foremanLocation, foremanRelativePath } = require('@theforeman/find-foreman');
const foremanFull = foremanLocation();
const foremanVendorRelative = './node_modules/@theforeman/vendor-core/';
const foremanVendorDir = foremanRelativePath(foremanVendorRelative);

module.exports = {
env: {
Expand Down Expand Up @@ -39,7 +37,7 @@ module.exports = {
"error",
{
// Need to check Katello, Foreman, and Foreman's meta package for dependencies
"packageDir": [path.join(__dirname, '../../katello'), foremanFull, foremanVendorDir]
"packageDir": [path.join(__dirname, '../../katello'), foremanFull]
}
],
'jsx-a11y/anchor-is-valid': [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ exports[`Content Details Info should render and contain appropriate components 1
loadingText="Loading"
timeout={300}
>
<ForwardRef
<Uncontrolled(TabContainer)
defaultActiveKey={1}
id="content-tabs-container"
style={
Expand Down Expand Up @@ -137,7 +137,7 @@ exports[`Content Details Info should render and contain appropriate components 1
</TabPane>
</TabContent>
</Grid>
</ForwardRef>
</Uncontrolled(TabContainer)>
</LoadingState>
</div>
`;
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ exports[`subscriptions details page should render and contain appropiate compone
}
}
/>
<ForwardRef
<Uncontrolled(TabContainer)
defaultActiveKey={1}
id="subscription-tabs-container"
>
Expand Down Expand Up @@ -531,6 +531,6 @@ exports[`subscriptions details page should render and contain appropiate compone
</Grid>
</LoadingState>
</div>
</ForwardRef>
</Uncontrolled(TabContainer)>
</div>
`;
Loading