diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-02 06:09:04 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-02 06:09:04 +0000 |
| commit | 9ecca14b2b3f05673a15399a2d1cc439206f3e0f (patch) | |
| tree | 750343fab3388130b3485eee3cb4b539c1903e71 /qa | |
| parent | 7f119dc26391dc953126b4fc902ade7b44a10ce2 (diff) | |
| download | gitlab-ce-9ecca14b2b3f05673a15399a2d1cc439206f3e0f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
3 files changed, 3 insertions, 3 deletions
diff --git a/qa/qa/resource/project_imported_from_github.rb b/qa/qa/resource/project_imported_from_github.rb index 28a0f12b3e3..b9dbd2a6131 100644 --- a/qa/qa/resource/project_imported_from_github.rb +++ b/qa/qa/resource/project_imported_from_github.rb @@ -17,7 +17,7 @@ module QA Page::Project::Import::Github.perform do |import_page| import_page.add_personal_access_token(github_personal_access_token) import_page.import!(github_repository_path, group.full_path, name) - import_page.wait_for_success(github_repository_path) + import_page.wait_for_success(github_repository_path, wait: 240) end reload! diff --git a/qa/qa/specs/features/api/1_manage/import_github_repo_spec.rb b/qa/qa/specs/features/api/1_manage/import_github_repo_spec.rb index 79bba484bea..79509bdbe01 100644 --- a/qa/qa/specs/features/api/1_manage/import_github_repo_spec.rb +++ b/qa/qa/specs/features/api/1_manage/import_github_repo_spec.rb @@ -36,7 +36,7 @@ module QA imported_project.reload! # import the project expect { imported_project.project_import_status[:import_status] }.to eventually_eq('finished') - .within(max_duration: 90, sleep_interval: 1) + .within(max_duration: 240, sleep_interval: 1) aggregate_failures do verify_status_data diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb index 3bf5a11b074..0477a9b8a1f 100644 --- a/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb +++ b/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb @@ -46,7 +46,7 @@ module QA import_page.import!(github_repo, group.full_path, imported_project.name) aggregate_failures do - expect(import_page).to have_imported_project(github_repo) + expect(import_page).to have_imported_project(github_repo, wait: 240) # validate button is present instead of navigating to avoid dealing with multiple tabs # which makes the test more complicated expect(import_page).to have_go_to_project_button(github_repo) |