Skip to content
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

Moving test from blacklist #3796

Merged
merged 4 commits into from
Dec 26, 2024
+13 −19
Merged

Moving test from blacklist #3796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
769d5d3
move test from the blacklist
Nebyt Dec 26, 2024
9a733e1
added missed id
Nebyt Dec 26, 2024
d80012a
minor fix
Nebyt Dec 26, 2024
97a3ba1
lint fix
Nebyt Dec 26, 2024
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
4 changes: 2 additions & 2 deletions packages/e2e-tests/pages/walletCommonBase.page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ class WalletCommonBase extends BasePage {
this.walletBalanceTextLocator,
async () => {
const rawBalanceText = await this.getText(this.walletBalanceTextLocator);
const balanceStr = rawBalanceText.split(' ')[0];
const balanceStr = rawBalanceText.split(' ')[0].trim();
return balanceStr === balanceReplacer;
}
);
Expand All @@ -335,7 +335,7 @@ class WalletCommonBase extends BasePage {
this.walletFiatBalanceTextLocator,
async () => {
const rawFiatBalanceText = await this.getText(this.walletFiatBalanceTextLocator);
const fiatBalanceStr = rawFiatBalanceText.split(' ')[0];
const fiatBalanceStr = rawFiatBalanceText.split(' ')[0].trim();
return fiatBalanceStr === balanceReplacer;
}
);
Expand Down
27 changes: 10 additions & 17 deletions ...test/blacklist/25_hideShowBalance.test.js → ...e2e-tests/test/25_hideShowBalance.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
import BasePage from '../../pages/basepage.js';
import { customAfterEach } from '../../utils/customHooks.js';
import TransactionsSubTab from '../../pages/wallet/walletTab/walletTransactions.page.js';
import ReceiveSubTab from '../../pages/wallet/walletTab/receiveSubTab.page.js';
import BasePage from '../pages/basepage.js';
import { customAfterEach } from '../utils/customHooks.js';
import TransactionsSubTab from '../pages/wallet/walletTab/walletTransactions.page.js';
import ReceiveSubTab from '../pages/wallet/walletTab/receiveSubTab.page.js';
import { expect } from 'chai';
import { getTestLogger } from '../../utils/utils.js';
import { oneMinute } from '../../helpers/timeConstants.js';
import driversPoolsManager from '../../utils/driversPool.js';
import { prepareWallet } from '../../helpers/restoreWalletHelper.js';
import { testWallet1 } from '../../utils/testWallets.js';
import { getTestLogger } from '../utils/utils.js';
import { oneMinute } from '../helpers/timeConstants.js';
import driversPoolsManager from '../utils/driversPool.js';
import { prepareWallet } from '../helpers/restoreWalletHelper.js';
import { testWallet1 } from '../utils/testWallets.js';

// Issue https://emurgo.atlassian.net/browse/YOEXT-1218
describe('Hide and show balance', function () {
this.timeout(2 * oneMinute);
let webdriver = null;
let logger = null;

before(async function () {
webdriver = await driversPoolsManager.getDriverFromPool();
logger = getTestLogger(this.test.parent.title);
webdriver = await driversPoolsManager.getDriverFromPool();
await prepareWallet(webdriver, logger, 'testWallet1', this);
});
// check the default state. The balance should be displayed
Expand Down Expand Up @@ -57,9 +56,6 @@ describe('Hide and show balance', function () {
await receivePage.selectBaseExtHasBalanceAddrs();
const balanceExtAddrHidden = await receivePage.allAddressesBalancesHidden();
expect(balanceExtAddrHidden, 'Balances of external addresses are not hidden').to.be.true;
await receivePage.selectBaseInterHasBalanceAddrs();
const balanceInterAddrHidden = await receivePage.allAddressesBalancesHidden();
expect(balanceInterAddrHidden, 'Balances of internal addresses are not hidden').to.be.true;
});
// add checking Staking page when testnetwork is added
// click show balance
Expand Down Expand Up @@ -96,9 +92,6 @@ describe('Hide and show balance', function () {
await receivePage.selectBaseExtHasBalanceAddrs();
const balanceExtAddrHidden = await receivePage.allAddressesBalancesHidden();
expect(balanceExtAddrHidden, 'Balances of external addresses are hidden').to.be.false;
await receivePage.selectBaseInterHasBalanceAddrs();
const balanceInterAddrHidden = await receivePage.allAddressesBalancesHidden();
expect(balanceInterAddrHidden, 'Balances of internal addresses are hidden').to.be.false;
});
// add checking Staking page when testnetwork is added

Expand Down
1 change: 1 addition & 0 deletions packages/yoroi-extension/app/components/topbar/NavWalletDetailsRevamp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ export default class NavWalletDetailsRevamp extends Component<Props> {
backgroundColor: 'ds.primary_500',
}}
color="primary"
id={amountDisplayId + '-showHideBalance-button'}
>
{shouldHideBalance ? (
<IconWrapper>
Expand Down
Loading