Skip to content

Commit 96cd558

Browse files
bunsenstraatbunsenstraat
authored
Merge pull request #6985 from remix-project-org/pinviewproblem
Refactor pinned plugin restore flow in app activation
2 parents 0295a1f + 582e702 commit 96cd558

File tree

7 files changed

+130
-122
lines changed

7 files changed

+130
-122
lines changed

‎apps/remix-ide-e2e/src/helpers/pool.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
require('dotenv').config()
2323

24-
const API_URL = process.env.REMIX_API_URL || 'https://auth.api.remix.live'
24+
const API_URL = process.env.REMIX_API_URL || 'https://api.remix.live'
2525
const API_KEY = process.env.E2E_POOL_API_KEY || ''
2626
const POOL_BASE = `${API_URL}/sso/test/pool`
2727

‎apps/remix-ide-e2e/src/tests/invite_manual_code.test.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,21 @@ module.exports = {
4242
done()
4343
},
4444

45-
'Should click Sign In to open login modal #group1': '' + function (browser: NightwatchBrowser) {
45+
'Should click Sign In to open login modal #group1': function (browser: NightwatchBrowser) {
4646
browser
4747
// No invite in URL, so no invite overlay — just the normal IDE with a Sign In button
4848
.waitForElementVisible('*[data-id="login-button"]', 30000)
4949
.click('*[data-id="login-button"]')
5050
.pause(2000)
5151
},
5252

53-
'Should show login modal with "I have an invite code" button #group1': '' + function (browser: NightwatchBrowser) {
53+
'Should show login modal with "I have an invite code" button #group1': function (browser: NightwatchBrowser) {
5454
browser
5555
// The login modal should now be open with the invite code toggle
5656
.waitForElementVisible('*[data-id="invite-code-toggle-btn"]', 15000)
5757
},
5858

59-
'Should enter invite code and submit #group1': '' + function (browser: NightwatchBrowser) {
59+
'Should enter invite code and submit #group1': function (browser: NightwatchBrowser) {
6060
browser
6161
// Click the "I have an invite code" button to reveal the input
6262
.click('*[data-id="invite-code-toggle-btn"]')
@@ -69,7 +69,7 @@ module.exports = {
6969
.pause(2000)
7070
},
7171

72-
'Should show invite overlay and click Sign In #group1': '' + function (browser: NightwatchBrowser) {
72+
'Should show invite overlay and click Sign In #group1': function (browser: NightwatchBrowser) {
7373
browser
7474
// The invite overlay should now be visible with a Sign In / login button
7575
.waitForElementVisible({
@@ -84,7 +84,7 @@ module.exports = {
8484
.pause(2000)
8585
},
8686

87-
'Should login via the test pool #group1': '' + function (browser: NightwatchBrowser) {
87+
'Should login via the test pool #group1': function (browser: NightwatchBrowser) {
8888
browser
8989
.pause(3000)
9090
.waitForElementVisible({
@@ -99,15 +99,15 @@ module.exports = {
9999
.pause(5000)
100100
},
101101

102-
'Should click Join Beta on the invite modal #group1': '' + function (browser: NightwatchBrowser) {
102+
'Should click Join Beta on the invite modal #group1': function (browser: NightwatchBrowser) {
103103
browser
104104
.waitForElementVisible('*[data-id="invite-join-beta-btn"]', 15000)
105105
.click('*[data-id="invite-join-beta-btn"]')
106106
.waitForElementVisible('*[data-id="invite-get-started-btn"]', 15000)
107107
.click('*[data-id="invite-get-started-btn"]')
108108
},
109109

110-
'Should show the user as logged in with test provider #group1': '' + function (browser: NightwatchBrowser) {
110+
'Should show the user as logged in with test provider #group1': function (browser: NightwatchBrowser) {
111111
browser
112112
.execute(function () {
113113
const user = localStorage.getItem('remix_user')
@@ -130,7 +130,7 @@ module.exports = {
130130
})
131131
},
132132

133-
'Should show BETA tag on user menu button #group1': '' + function (browser: NightwatchBrowser) {
133+
'Should show BETA tag on user menu button #group1': function (browser: NightwatchBrowser) {
134134
browser
135135
.waitForElementVisible('*[data-id="user-menu-compact"]', 10000)
136136
.click('*[data-id="user-menu-compact"]')

‎apps/remix-ide-e2e/src/tests/invite_membership_request.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ module.exports = {
4343
browser.end()
4444
done()
4545
},
46-
'Should show the membership request form #group1': '' + function (browser: NightwatchBrowser) {
46+
'Should show the membership request form #group1': function (browser: NightwatchBrowser) {
4747
browser
4848
.waitForElementVisible('*[data-id="survey-ai-yes"]', 30000)
4949
},
5050

51-
'Should fill in the form and submit #group1': '' + function (browser: NightwatchBrowser) {
51+
'Should fill in the form and submit #group1': function (browser: NightwatchBrowser) {
5252
browser
5353
.click('*[data-id="survey-ai-yes"]')
5454
// Select at least one subscription feature
@@ -58,14 +58,14 @@ module.exports = {
5858
.click('*[data-id="membership-apply-btn"]')
5959
},
6060

61-
'Should see the success confirmation #group1': '' + function (browser: NightwatchBrowser) {
61+
'Should see the success confirmation #group1': function (browser: NightwatchBrowser) {
6262
browser
6363
.waitForElementVisible('*[data-id="membership-got-it-btn"]', 15000)
6464
.click('*[data-id="membership-got-it-btn"]')
6565
.waitForElementNotPresent('.invite-overlay', 5000)
6666
},
6767

68-
'Should receive approval notification #group1': '' + function (browser: NightwatchBrowser) {
68+
'Should receive approval notification #group1': function (browser: NightwatchBrowser) {
6969
browser
7070
// Wait for the notification badge to appear (polling may take up to ~2 min)
7171
.waitForElementVisible('*[data-id="notification-badge"]', 120000)
@@ -77,7 +77,7 @@ module.exports = {
7777
.click('.notification-action-invitation')
7878

7979
},
80-
'look at the beta invite system #group1': '' + function (browser: NightwatchBrowser) {
80+
'look at the beta invite system #group1': function (browser: NightwatchBrowser) {
8181
browser
8282
// Wait for the invite modal's "Sign In" button and click it
8383
.waitForElementVisible({

‎apps/remix-ide-e2e/src/tests/invite_system.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ module.exports = {
4343
browser.end()
4444
done()
4545
},
46-
'look at the beta invite system #group1': '' + function (browser: NightwatchBrowser) {
46+
'look at the beta invite system #group1': function (browser: NightwatchBrowser) {
4747
browser
4848
// Wait for the invite modal's "Sign In" button and click it
4949
.waitForElementVisible({
@@ -59,7 +59,7 @@ module.exports = {
5959
},
6060

6161

62-
'Should login via the test pool through the real UI flow #group1': '' + function (browser: NightwatchBrowser) {
62+
'Should login via the test pool through the real UI flow #group1': function (browser: NightwatchBrowser) {
6363
browser
6464
.pause(3000)
6565
// The modal should detect the e2e_pool_key and show the "E2E Test Pool" button
@@ -77,7 +77,7 @@ module.exports = {
7777
.pause(5000)
7878
},
7979

80-
'Should click Join Beta on the invite modal #group1': '' + function (browser: NightwatchBrowser) {
80+
'Should click Join Beta on the invite modal #group1': function (browser: NightwatchBrowser) {
8181
browser
8282
// Wait for the "Join the Beta" button in the invite modal footer
8383
.waitForElementVisible('*[data-id="invite-join-beta-btn"]', 15000)
@@ -87,7 +87,7 @@ module.exports = {
8787
.click('*[data-id="invite-get-started-btn"]')
8888
},
8989

90-
'Should show the user as logged in with test provider #group1': '' + function (browser: NightwatchBrowser) {
90+
'Should show the user as logged in with test provider #group1': function (browser: NightwatchBrowser) {
9191
browser
9292
.execute(function () {
9393
const user = localStorage.getItem('remix_user')
@@ -110,7 +110,7 @@ module.exports = {
110110
})
111111
},
112112

113-
'Should show BETA tag on user menu button #group1': '' + function (browser: NightwatchBrowser) {
113+
'Should show BETA tag on user menu button #group1': function (browser: NightwatchBrowser) {
114114
browser
115115
.waitForElementVisible('*[data-id="user-menu-compact"]', 10000)
116116
.click('*[data-id="user-menu-compact"]')

0 commit comments

Comments
 (0)