fix windows having fixed oder + anison warning

grosser · May 20, 2024 · 39f3f93 · 39f3f93
1 parent 66511b2
commit 39f3f93
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,7 +1,6 @@
 name: test
 
 on:
-  push:
   pull_request:
 
 jobs:

diff --git a/spec/integration_spec.rb b/spec/integration_spec.rb
@@ -571,12 +571,13 @@ def test_unicode
       write "features/fail2.feature", "Feature: xxx\n  Scenario: xxx\n    Given I fail"
       results = run_tests ["features"], processes: 3, type: "cucumber", fail: true
 
-      failing_scenarios = if Gem.win_platform?
+      failing_scenarios = if Gem.win_platform? && RUBY_VERSION < "3.3.0"
         ["cucumber features/fail1.feature:2 # Scenario: xxx", "cucumber features/fail2.feature:2 # Scenario: xxx"]
       else
         ["cucumber features/fail2.feature:2 # Scenario: xxx", "cucumber features/fail1.feature:2 # Scenario: xxx"]
       end
 
+      results.gsub!(/.*WARNING.*\n/, "")
       expect(results).to include <<-EOF.gsub('        ', '')
         Failing Scenarios:
         #{failing_scenarios[0]}

diff --git a/spec/parallel_tests/cucumber/runner_spec.rb b/spec/parallel_tests/cucumber/runner_spec.rb
@@ -21,7 +21,18 @@ def call(*args)
           "Failing Scenarios:", "cucumber features/failure:3", "cucumber features/failure:4",
           "Failing Scenarios:", "cucumber features/failure:5", "cucumber features/failure:6"
         ]
-        expect(call(results)).to eq("Failing Scenarios:\ncucumber features/failure:1\ncucumber features/failure:2\ncucumber features/failure:3\ncucumber features/failure:4\ncucumber features/failure:5\ncucumber features/failure:6\n\n")
+        output = call(results)
+        output.gsub!(/.*WARNING.*\n/, "")
+        expect(output).to eq(<<~TXT)
+          Failing Scenarios:
+          cucumber features/failure:1
+          cucumber features/failure:2
+          cucumber features/failure:3
+          cucumber features/failure:4
+          cucumber features/failure:5
+          cucumber features/failure:6
+
+        TXT
       end
 
       it "collates flaky scenarios separately" do

diff --git a/spec/parallel_tests/test/runner_spec.rb b/spec/parallel_tests/test/runner_spec.rb
@@ -43,7 +43,7 @@ def call(*args)
     end
 
     it "uses given when passed found" do
-      result = Gem.win_platform? ? [["a", "b"], ["c"]] : [["a", "c"], ["b"]]
+      result = (Gem.win_platform? && RUBY_VERSION < "3.3.0" ? [["a", "b"], ["c"]] : [["a", "c"], ["b"]])
       expect(call(["a", "b", "c"], 2, group_by: :found)).to eq(result)
     end