8000 fix CI by johrstrom · Pull Request #4225 · OSC/ondemand · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix CI #4225

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.

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

Merged
merged 24 commits into from
Mar 21, 2025
Merged

fix CI #4225

Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 1 deletion apps/dashboard/test/system/batch_connect_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1484,6 +1484,7 @@ def get_favorites
click_on('Save')

click_on('Launch', wait: 30)
sleep 3
expected = output_fixture('user_settings/simple_bc_test.yml')
actual = File.read("#{dir}/settings.yml")

Expand All @@ -1508,10 +1509,11 @@ def get_favorites

check('batch_connect_session_save_template')
fill_in('modal_input_template_new_name', with: 'test template')
sleep 5 # modal needs to sleep?
sleep 2 # modal needs to sleep?
click_on('Save')

click_on('Save settings and close', wait: 30)
sleep 2
expected = output_fixture('user_settings/simple_bc_test.yml')
actual = File.read("#{dir}/settings.yml")

Expand Down
2 changes: 2 additions & 0 deletions apps/dashboard/test/system/preset_apps_navbar_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ def err_header
click_on 'Interactive Apps'
click_on 'Test App: Preset'

sleep 1.5
verify_bc_alert('sys/preset_app/preset', err_header, err_msg)
end

Expand All @@ -37,6 +38,7 @@ def err_header
assert_equal new_batch_connect_session_context_path('sys/preset_app/choice'), current_path
click_on 'Launch'

sleep 1.5
verify_bc_alert('sys/preset_app/choice', err_header, err_msg)
end
end
2 changes: 2 additions & 0 deletions apps/dashboard/test/system/preset_apps_pinned_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def err_header
test 'preset apps in pinned apps directly launch' do
visit root_path
click_on 'Test App: Preset'
sleep 1.5
verify_bc_alert('sys/preset_app/preset', err_header, err_msg)
end

Expand All @@ -40,6 +41,7 @@ def err_header
assert_equal new_batch_connect_session_context_path('sys/preset_app/choice'), current_path
click_on 'Launch'

sleep 1.5
verify_bc_alert('sys/preset_app/choice', err_header, err_msg)
end
end
5 changes: 3 additions & 2 deletions apps/dashboard/test/system/products_dev_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ def setup

assert_equal 'fas fa-dumpster-fire fa-fw app-icon', find_css_class('product_icon')
click_on 'Save'
sleep 1
actual_manifest = File.read("#{dir}/dashboard/manifest.yml")
expected_manifest = <<~HEREDOC
---
Expand All @@ -126,8 +127,8 @@ def setup
icon: fas://dumpster-fire
HEREDOC

assert_equal current_path, product_path('dev', 'dashboard')
assert_equal expected_manifest, actual_manifest
assert_equal(product_path('dev', 'dashboard'), current_path)
assert_equal(expected_manifest, actual_manifest)
end
end
end
3 changes: 3 additions & 0 deletions apps/dashboard/test/system/project_manager_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,7 @@ def add_auto_environment_variable(project_id, launcher_id, save: true)
launcher_id = setup_launcher(project_id)
add_account(project_id, launcher_id)

sleep 0.5
visit edit_project_launcher_path(project_id, launcher_id)

find('#edit_launcher_auto_accounts').click
Expand Down Expand Up @@ -845,6 +846,7 @@ def add_auto_environment_variable(project_id, launcher_id, save: true)
launcher_id = setup_launcher(project_id)
8000 add_account(project_id, launcher_id)

sleep 0.5
visit edit_project_launcher_path(project_id, launcher_id)

find('#edit_launcher_auto_accounts').click
Expand Down Expand Up @@ -913,6 +915,7 @@ def add_auto_environment_variable(project_id, launcher_id, save: true)
assert_equal('', File.read("#{dir}/.project_lookup"))

click_on(I18n.t('dashboard.save'))
sleep 2

assert_equal(2, Dir.children(dir).size)
project_dir = Dir.children(dir).select { |path| File.directory?("#{dir}/#{path}") }.first
Expand Down
4 changes: 3 additions & 1 deletion spec/e2e/proxy_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ def browser
end

it 'rnode proxies directly to the origin' do
sleep 10
browser.goto "#{ctr_base_url}/rnode/localhost/5000/simple-page"
sleep 10
expect(browser.url).to eq("#{ctr_base_url}/rnode/localhost/5000/simple-page")
expect(browser.div(id: 'test-div').present?).to be true
end
Expand Down Expand Up @@ -195,4 +197,4 @@ def browser
# end

# TODO: check content of page.
end
end
0