diff --git a/e2e/08-autofix/imports-order/Foo1.sol b/e2e/08-autofix/imports-order/Foo1.sol index d833c02e..a15c2fb7 100644 --- a/e2e/08-autofix/imports-order/Foo1.sol +++ b/e2e/08-autofix/imports-order/Foo1.sol @@ -13,7 +13,7 @@ import { IXTokenFactory, holaquetal } from '../../token/interfaces/IXTokenFactor import './../../bpath/otherfolder/otherfolder/aContract.sol'; import '@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol'; import { FakeContract2 } from '../../../token/interfaces/FakeContract2.sol'; -import './../../apath/zContract.sol'; +import '../../apath/zContract.sol'; import 'http://github.com/owner/repo/blob/branch/path/to/Contract2.sol'; import { Afool1 } from './Afool1.sol'; import './Ownable.sol'; diff --git a/e2e/08-autofix/imports-order/Foo1AfterFix.sol b/e2e/08-autofix/imports-order/Foo1AfterFix.sol index 281f064b..2bd5c468 100644 --- a/e2e/08-autofix/imports-order/Foo1AfterFix.sol +++ b/e2e/08-autofix/imports-order/Foo1AfterFix.sol @@ -2,14 +2,14 @@ pragma solidity ^0.8.0; import './../../../../token/interfaces/AFakeContract1.sol'; -import '../../../../token/interfaces/FakeContract1.sol'; -import { FakeContract2 } from '../../../token/interfaces/FakeContract2.sol'; -import { FakeContract3 } from '../../../token/interfaces/FakeContract3.sol'; +import './../../../../token/interfaces/FakeContract1.sol'; +import { FakeContract2 } from './../../../token/interfaces/FakeContract2.sol'; +import { FakeContract3 } from './../../../token/interfaces/FakeContract3.sol'; import './../../apath/zContract.sol'; import './../../bpath/otherfolder/otherfolder/aContract.sol'; -import { holaquetal, IXTokenFactory } from '../../token/interfaces/IXTokenFactory.sol'; +import { holaquetal, IXTokenFactory } from './../../token/interfaces/IXTokenFactory.sol'; import './../token/interfaces/IXTokenWrapper.sol'; -import { IXTokenWrapper2 } from '../token/interfaces/IXTokenWrapper2.sol'; +import { IXTokenWrapper2 } from './../token/interfaces/IXTokenWrapper2.sol'; import { Afool1 } from './Afool1.sol'; import { add as func, Point, Unauthorized } from './Foo.sol'; import { Initializable } from './openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol'; diff --git a/e2e/08-autofix/imports-order/Foo1BeforeFix.sol b/e2e/08-autofix/imports-order/Foo1BeforeFix.sol index d833c02e..a15c2fb7 100644 --- a/e2e/08-autofix/imports-order/Foo1BeforeFix.sol +++ b/e2e/08-autofix/imports-order/Foo1BeforeFix.sol @@ -13,7 +13,7 @@ import { IXTokenFactory, holaquetal } from '../../token/interfaces/IXTokenFactor import './../../bpath/otherfolder/otherfolder/aContract.sol'; import '@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol'; import { FakeContract2 } from '../../../token/interfaces/FakeContract2.sol'; -import './../../apath/zContract.sol'; +import '../../apath/zContract.sol'; import 'http://github.com/owner/repo/blob/branch/path/to/Contract2.sol'; import { Afool1 } from './Afool1.sol'; import './Ownable.sol'; diff --git a/e2e/autofix-test.js b/e2e/autofix-test.js index 20d01033..df9f0b0a 100644 --- a/e2e/autofix-test.js +++ b/e2e/autofix-test.js @@ -603,7 +603,7 @@ describe('e2e', function () { it('should get the right report (10)', () => { const reportLines = stdout.split('\n') - const finalLine = '10 problems (10 errors, 0 warnings)' + const finalLine = '18 problems (18 errors, 0 warnings)' expect(reportLines[reportLines.length - 3]).to.contain(finalLine) }) })