ci: Improve some slow tests (#471)

Author: dazuma

toys-release/toys/.test/test_request_logic.rb

@@ -10,7 +10,9 @@
   let(:request_spec) { Toys::Release::RequestSpec.new(environment_utils) }
 
   it "handles Toys one commit after v0.19.0 tag" do
-    repository.all_components.each { |component| request_spec.add(component) }
+    ["toys", "toys-core", "toys-release", "common-tools"].each do |comp_name|
+      request_spec.add(repository.component_named(comp_name))
+    end
     request_spec.resolve_versions("47cfeffc9ba275dab7604e30038fed107636304f", repository)
     request_logic = Toys::Release::RequestLogic.new(repository, request_spec)
     assert_equal("release: Release 3 items", request_logic.build_commit_title)
@@ -67,7 +69,6 @@
         "requested_components": {
           "toys": null,
           "toys-core": null,
-          "toys-ci": null,
           "toys-release": null,
           "common-tools": null
         },

toys-release/toys/.test/test_request_spec.rb

@@ -32,16 +32,20 @@
       # Can't make any particular assertion here. Just make sure it didn't crash.
     end
 
-    it "resolves default changes to Toys at v0.19.0 tag" do
-      repository.all_components.each { |component| request_spec.add(component) }
+    it "resolves changes when no changes are expected" do
+      ["toys", "toys-core", "toys-release", "common-tools"].each do |comp_name|
+        request_spec.add(repository.component_named(comp_name))
+      end
       request_spec.resolve_versions(repository.current_sha("toys/v0.19.0"), repository)
-      # At this point, toys, toys-core, and toys-release were just released and
+      # At this tag, toys, toys-core, and toys-release were just released and
       # should show no changes, and common-tools had no updates since 0.18.0.
       assert_empty(request_spec.resolved_components)
     end
 
-    it "resolves default changes to Toys expecting only toys-release changes" do
-      repository.all_components.each { |component| request_spec.add(component) }
+    it "resolves changes when one component has changed but no others have" do
+      ["toys", "toys-core", "toys-release", "common-tools"].each do |comp_name|
+        request_spec.add(repository.component_named(comp_name))
+      end
       request_spec.resolve_versions("450e87c777d642f2adf0add69cbcc0bca243c9d9", repository)
       # This is one commit after toys-release/v0.2.1.
       # At this point, only toys-release had updates.
@@ -75,7 +79,9 @@
     end
 
     it "resolves default changes to Toys with a coordination group" do
-      repository.all_components.each { |component| request_spec.add(component) }
+      ["toys", "toys-core", "toys-release", "common-tools"].each do |comp_name|
+        request_spec.add(repository.component_named(comp_name))
+      end
       request_spec.resolve_versions("47cfeffc9ba275dab7604e30038fed107636304f", repository)
       # This is one commit after toys/v0.19.0.
       # This commit modifies toys-core and toys-release, and should bring toys in

toys-release/toys/.test/test_steps.rb

@@ -306,7 +306,6 @@ def make_dummy_docs
     end
 
     before do
-      skip "Skipped integration test" unless ENV["TOYS_TEST_INTEGRATION"]
       fake_tool_context.prevent_real_exec_prefix(["git", "push"])
     end
 
@@ -323,60 +322,64 @@ def make_dummy_docs
       assert_equal(["custom_build"], ::Toys::Release::Steps::PUSH_GH_PAGES.dependencies(step_context))
     end
 
-    it "aborts if docs exist" do
-      make_dummy_docs
-      step_context = make_context(version: released_version)
-      assert_raises(Toys::Release::Pipeline::StepExit) do
-        capture_subprocess_io do
-          ::Toys::Release::Steps::PUSH_GH_PAGES.run(step_context)
-        end
+    describe "#run" do
+      before do
+        skip "Skipped integration test" unless ENV["TOYS_TEST_INTEGRATION"]
+        make_dummy_docs
       end
-      assert_equal(1, @performer_result.successes.size)
-      assert_equal("Docs already published for toys #{released_version}", @performer_result.successes.first)
-    end
 
-    it "does a dry run publish" do
-      make_dummy_docs
-      step_context = make_context(dry_run: true)
-      capture_subprocess_io do
-        ::Toys::Release::Steps::PUSH_GH_PAGES.run(step_context)
-      end
-      assert_equal(1, @performer_result.successes.size)
-      assert_equal("DRY RUN documentation published for toys #{unreleased_version}.", @performer_result.successes.first)
-      path = ::File.join(step_context.temp_dir, "gems", "toys", "v#{unreleased_version}", "index.html")
-      assert(::File.file?(path), "Expected docs to be copied into gh-pages")
-      content = ::File.read(::File.join(step_context.temp_dir, "404.html"))
-      assert_includes(content, "version_toys = #{unreleased_version.inspect};")
-      ["index.html", "latest/index.html"].each do |filename|
-        content = ::File.read(::File.join(step_context.temp_dir, "gems", "toys", filename))
-        assert_includes(content, "<a href=\"https://dazuma.github.io/toys/gems/toys/v#{unreleased_version}\">")
-        assert_includes(content, "<link rel=\"canonical\" href=\"https://dazuma.github.io/toys/gems/toys/v#{unreleased_version}\">")
-        assert_includes(content, "<meta http-equiv=\"refresh\" content=\"0; url=https://dazuma.github.io/toys/gems/toys/v#{unreleased_version}\">")
-        assert_includes(content, "window.location.replace(\"https://dazuma.github.io/toys/gems/toys/v#{unreleased_version}\");")
+      it "aborts if docs exist" do
+        step_context = make_context(version: released_version)
+        assert_raises(Toys::Release::Pipeline::StepExit) do
+          capture_subprocess_io do
+            ::Toys::Release::Steps::PUSH_GH_PAGES.run(step_context)
+          end
+        end
+        assert_equal(1, @performer_result.successes.size)
+        assert_equal("Docs already published for toys #{released_version}", @performer_result.successes.first)
       end
-    end
 
-    it "does a real publish" do
-      make_dummy_docs
-      step_context = make_context(dry_run: false)
-      fake_tool_context.stub_exec(["git", "push", "origin", "gh-pages"])
-      capture_subprocess_io do
-        ::Toys::Release::Steps::PUSH_GH_PAGES.run(step_context)
+      it "does a dry run publish" do
+        step_context = make_context(dry_run: true)
+        capture_subprocess_io do
+          ::Toys::Release::Steps::PUSH_GH_PAGES.run(step_context)
+        end
+        assert_equal(1, @performer_result.successes.size)
+        assert_equal("DRY RUN documentation published for toys #{unreleased_version}.",
+                     @performer_result.successes.first)
+        path = ::File.join(step_context.temp_dir, "gems", "toys", "v#{unreleased_version}", "index.html")
+        assert(::File.file?(path), "Expected docs to be copied into gh-pages")
+        content = ::File.read(::File.join(step_context.temp_dir, "404.html"))
+        assert_includes(content, "version_toys = #{unreleased_version.inspect};")
+        ["index.html", "latest/index.html"].each do |filename|
+          content = ::File.read(::File.join(step_context.temp_dir, "gems", "toys", filename))
+          assert_includes(content, "<a href=\"https://dazuma.github.io/toys/gems/toys/v#{unreleased_version}\">")
+          assert_includes(content, "<link rel=\"canonical\" href=\"https://dazuma.github.io/toys/gems/toys/v#{unreleased_version}\">")
+          assert_includes(content, "<meta http-equiv=\"refresh\" content=\"0; url=https://dazuma.github.io/toys/gems/toys/v#{unreleased_version}\">")
+          assert_includes(content, "window.location.replace(\"https://dazuma.github.io/toys/gems/toys/v#{unreleased_version}\");")
+        end
       end
-      assert_equal(1, @performer_result.successes.size)
-      assert_equal("Published documentation for toys #{unreleased_version}.", @performer_result.successes.first)
-    end
 
-    it "fails to publish" do
-      make_dummy_docs
-      step_context = make_context(dry_run: false)
-      fake_tool_context.stub_exec(["git", "push", "origin", "gh-pages"], result_code: 1)
-      assert_raises(Toys::Release::Pipeline::PipelineExit) do
+      it "does a real publish" do
+        step_context = make_context(dry_run: false)
+        fake_tool_context.stub_exec(["git", "push", "origin", "gh-pages"])
         capture_subprocess_io do
           ::Toys::Release::Steps::PUSH_GH_PAGES.run(step_context)
         end
+        assert_equal(1, @performer_result.successes.size)
+        assert_equal("Published documentation for toys #{unreleased_version}.", @performer_result.successes.first)
+      end
+
+      it "fails to publish" do
+        step_context = make_context(dry_run: false)
+        fake_tool_context.stub_exec(["git", "push", "origin", "gh-pages"], result_code: 1)
+        assert_raises(Toys::Release::Pipeline::PipelineExit) do
+          capture_subprocess_io do
+            ::Toys::Release::Steps::PUSH_GH_PAGES.run(step_context)
+          end
+        end
+        assert_empty(@performer_result.successes)
       end
-      assert_empty(@performer_result.successes)
     end
   end