Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-13 14:55:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Drop qunit timeout args (#28775)

Browse Source 
whatever was using that value is long gone
This commit is contained in:
Jarek Radosz 2024-09-06 13:08:42 +02:00 committed by GitHub
parent 722c008adb
commit 4792468c88
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/tests.yml vendored
View File

@ -233,7 +233,7 @@ jobs:
- name: Plugin QUnit - name: Plugin QUnit
if: matrix.build_type == 'frontend' && matrix.target == 'plugins' if: matrix.build_type == 'frontend' && matrix.target == 'plugins'
run: QUNIT_WRITE_EXECUTION_FILE=1 bin/rake plugin:qunit['*','1200000'] run: QUNIT_WRITE_EXECUTION_FILE=1 bin/rake plugin:qunit['*']
timeout-minutes: 30 timeout-minutes: 30
- name: Theme QUnit - name: Theme QUnit

9
lib/tasks/docker.rake
View File

@ -299,8 +299,6 @@ task "docker:test" do
end end
unless ENV["RUBY_ONLY"] unless ENV["RUBY_ONLY"]
js_timeout = ENV["JS_TIMEOUT"].presence || 900_000 # 15 minutes
unless ENV["SKIP_CORE"] unless ENV["SKIP_CORE"]
@good &&= @good &&=
run_or_fail( run_or_fail(
@ -310,14 +308,11 @@ task "docker:test" do
unless ENV["SKIP_PLUGINS"] unless ENV["SKIP_PLUGINS"]
if ENV["SINGLE_PLUGIN"] if ENV["SINGLE_PLUGIN"]
@good &&= @good &&= run_or_fail("CI=1 bundle exec rake plugin:qunit['#{ENV["SINGLE_PLUGIN"]}']")
run_or_fail(
"CI=1 bundle exec rake plugin:qunit['#{ENV["SINGLE_PLUGIN"]}','#{js_timeout}']",
)
else else
@good &&= @good &&=
run_or_fail( run_or_fail(
"QUNIT_PARALLEL=#{qunit_concurrency} CI=1 bundle exec rake plugin:qunit['*','#{js_timeout}']", "QUNIT_PARALLEL=#{qunit_concurrency} CI=1 bundle exec rake plugin:qunit['*']",
) )
end end
end end

4
lib/tasks/plugin.rake
View File

@ -221,7 +221,7 @@ task "plugin:turbo_spec", %i[plugin argv] do |_, args|
end end
desc "run plugin qunit tests" desc "run plugin qunit tests"
task "plugin:qunit", %i[plugin timeout] do |t, args| task "plugin:qunit", :plugin do |t, args|
args.with_defaults(plugin: "*") args.with_defaults(plugin: "*")
rake = "#{Rails.root}/bin/rake" rake = "#{Rails.root}/bin/rake"
@ -238,9 +238,7 @@ task "plugin:qunit", %i[plugin timeout] do |t, args|
end end
cmd += "TARGET='#{target}' " cmd += "TARGET='#{target}' "
cmd += "#{rake} qunit:test" cmd += "#{rake} qunit:test"
cmd += "[#{args[:timeout]}]" if args[:timeout]
system cmd system cmd
exit $?.exitstatus exit $?.exitstatus

2
lib/tasks/qunit.rake
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
desc "Runs the qunit test suite" desc "Runs the qunit test suite"
task "qunit:test", %i[timeout qunit_path filter] do |_, args| task "qunit:test", %i[qunit_path filter] do |_, args|
require "socket" require "socket"
require "chrome_installed_checker" require "chrome_installed_checker"

2
lib/tasks/themes.rake
View File

@ -146,7 +146,7 @@ task "themes:qunit", :type, :value do |t, args|
ENV["THEME_#{type.upcase}"] = value.to_s ENV["THEME_#{type.upcase}"] = value.to_s
ENV["QUNIT_RAILS_ENV"] ||= "development" # qunit:test will switch to `test` by default ENV["QUNIT_RAILS_ENV"] ||= "development" # qunit:test will switch to `test` by default
Rake::Task["qunit:test"].reenable Rake::Task["qunit:test"].reenable
Rake::Task["qunit:test"].invoke(1_200_000, "/theme-qunit") Rake::Task["qunit:test"].invoke("/theme-qunit")
end end
desc "Install a theme/component on a temporary DB and run QUnit tests" desc "Install a theme/component on a temporary DB and run QUnit tests"