Skip to content

Commit f826e31

Browse files
author
Sophie Turner
authored
Merge branch 'master' into feature/add-simultaneous-attempts-selector
2 parents 80ce2f0 + 79db848 commit f826e31

33 files changed

+6397
-363
lines changed

.github/workflows/sync.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ jobs:
1212
steps:
1313
- name: Call Swarm Sync Endpoint
1414
run: |
15-
curl -G "https://boltwall.swarm38.sphinx.chat/api/git/sync" \
16-
--header "x-api-token: ${{ secrets.SWARM_API_KEY }}" \
17-
--data-urlencode "source_link=https://github.com/stakwork/sphinx-tribes,https://github.com/stakwork/sphinx-tribes-frontend" \
18-
--data-urlencode "pat=${{ secrets.PAT }}"
15+
curl -G "https://stakgraph.swarm38.sphinx.chat/sync" \
16+
--header "Authorization: Bearer ${{ secrets.SWARM_API_KEY }}" \
17+
-d '{"repo_url":"https://github.com/stakwork/sphinx-tribes-frontend"}'

cypress.config.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,17 @@ export default defineConfig({
44
viewportWidth: 1800,
55
viewportHeight: 1200,
66
video: true,
7+
defaultCommandTimeout: 10000,
8+
requestTimeout: 15000,
9+
responseTimeout: 30000,
10+
pageLoadTimeout: 60000,
711
e2e: {
812
retries: {
913
runMode: 3,
1014
openMode: 1
1115
},
16+
experimentalMemoryManagement: true,
17+
numTestsKeptInMemory: 5,
1218
setupNodeEvents(on, config) {
1319
// implement node event listeners here
1420
}

cypress/e2e/45_adminBountyList.cy.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@ describe('Super Admin Bounties List', () => {
1313
deliverables: 'We are good to go man'
1414
};
1515

16-
beforeEach(() => {
16+
it('Should create five bounties and verify they are listed in the admin page under different time frames', () => {
1717
cy.login(activeUser);
18-
cy.wait(1000);
19-
});
18+
cy.wait(3000);
2019

21-
it('Should create five bounties and verify they are listed in the admin page under different time frames', () => {
2220
for (let i = 1; i <= 5; i++) {
2321
const updatedBounty = { ...bounty, title: `AliRazaTask${i}` };
2422
cy.create_bounty(updatedBounty);

cypress/e2e/50_adminCustomDateSelect.cy.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ describe('Admin Statistics Custom Date Range', () => {
99
amount: '123'
1010
};
1111

12-
beforeEach(() => {
12+
it('Creates 25 bounties, navigates to Admin page, and verifies bounties count and visibility', () => {
1313
cy.login(activeUser);
14-
cy.wait(1000);
15-
});
14+
cy.wait(3000);
1615

17-
it('Creates 25 bounties, navigates to Admin page, and verifies bounties count and visibility', () => {
1816
for (let i = 1; i <= 25; i++) {
1917
const updatedBounty = { ...bounty, title: `UmerJobs${i}` };
2018
cy.create_bounty(updatedBounty);

cypress/e2e/53_workspaceMission.cy.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,28 +55,25 @@ describe('Create Workspace And Update Mission', () => {
5555
const repoName = 'Repo Name';
5656
cy.get('[data-testid="repo-name-input"]').type(repoName);
5757
cy.get('[data-testid="repo-url-input"]').type('https://github.com/test/repo');
58-
cy.get('button').contains('Save').click();
58+
cy.get('button').contains('Create').click();
5959
cy.wait(500);
6060

6161
cy.contains('Add New Repository').should('not.exist');
62-
cy.get('h5').contains('Repositories').should('be.visible');
6362
cy.contains(repoName).should('exist', { timeout: 1000 });
6463

65-
cy.get('[data-testid="repository-option-btn"]').click();
6664
cy.get('[data-testid="repository-edit-btn"]').click();
6765
cy.wait(500);
6866

6967
const updatedRepoName = 'Updated Repo';
7068
cy.get('[data-testid="repo-name-input"]').clear().type(updatedRepoName);
7169
cy.get('[data-testid="repo-url-input"]').clear().type('https://github.com/updated/repo');
72-
cy.get('button').contains('Save').click();
70+
cy.get('[data-testid="add-repo-btn"]').click();
7371
cy.wait(500);
7472

7573
cy.contains('Add New Repository').should('not.exist');
7674
cy.contains(updatedRepoName).should('be.visible');
7775
cy.contains('https://github.com/updated/repo').should('be.visible');
7876

79-
cy.get('[data-testid="repository-option-btn"]').click();
8077
cy.get('[data-testid="repository-edit-btn"]').click();
8178
cy.get('button').contains('Delete').click();
8279
cy.wait(1000);

cypress/e2e/62_addFeatureCall.cy.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,22 @@ describe('Check for Feature Call Url placeholder', () => {
2929
});
3030
cy.wait(1000);
3131

32-
cy.contains('Not Configured').should('exist', { timeout: 1000 });
33-
cy.get('[data-testid="featurecall-option-btn-1"]').click();
32+
cy.contains('Not configured. Set up a webhook for feature calls.').should('exist', {
33+
timeout: 1000
34+
});
35+
cy.get('[data-testid="featurecall-add-btn-1"]').click();
3436
cy.wait(1000);
3537

36-
cy.get('[data-testid="featurecall-edit-btn-1"]').click();
38+
cy.contains('Feature Call URL').should('exist');
3739
cy.wait(1000);
38-
39-
cy.contains('Edit Feature Call URL').should('exist');
4040
cy.get('[data-testid="feature-call-url-input"]').should('have.value', '');
4141

4242
cy.get('[data-testid="feature-call-url-input"]').type('https://testfeature.com');
4343
cy.wait(1000);
4444

4545
cy.get('[data-testid="add-featurecall-btn"]').click();
46-
cy.wait(2000);
46+
cy.wait(3000);
4747

48-
cy.contains('Not Configured').should('exist');
48+
cy.contains('Not configured. Set up a webhook for feature calls.').should('exist');
4949
});
5050
});

0 commit comments

Comments
 (0)