Merge pull request #104 from amazing-print/add-merge-queue

Update CI for merge queue
amazing-print · Jan 9, 2024 · 25b01d1 · 25b01d1
2 parents c5733be + 6e0b6c2
commit 25b01d1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -1,6 +1,7 @@
 name: Lints
 
 on:
+  merge_group:
   pull_request:
   push:
     branches:

diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
@@ -1,6 +1,7 @@
 name: Specs
 
 on:
+  merge_group:
   pull_request:
   push:
     branches:

diff --git a/spec/ext/nokogiri_spec.rb b/spec/ext/nokogiri_spec.rb
@@ -6,7 +6,7 @@
   it 'colorizes tags' do
     xml = Nokogiri::XML('<html><body><h1></h1></body></html>')
     # FIXME: Due to something strange with Nokogiri and JRuby, we need to remove extra blank lines.
-    output = xml.ai.gsub(/\n\n/, "\n")
+    output = xml.ai.gsub("\n\n", "\n")
     expect(output).to eq <<~EOS
       <?xml version="1.0"?>\e[1;32m
       \e[0m<\e[1;36mhtml\e[0m>\e[1;32m
@@ -32,7 +32,7 @@
   it 'colorizes class and id' do
     xml = Nokogiri::XML('<html><body><h1><span class="world" id="hello"></span></h1></body></html>')
     # FIXME: Due to something strange with Nokogiri and JRuby, we need to remove extra blank lines.
-    output = xml.ai.gsub(/\n\n/, "\n")
+    output = xml.ai.gsub("\n\n", "\n")
     expect(output).to eq <<~EOS
       <?xml version="1.0"?>\e[1;32m
       \e[0m<\e[1;36mhtml\e[0m>\e[1;32m

diff --git a/spec/formats_spec.rb b/spec/formats_spec.rb
@@ -499,13 +499,13 @@
 
   #------------------------------------------------------------------------------
   describe 'File' do
-    it 'displays a file (plain)', unix: true do
+    it 'displays a file (plain)', :unix do
       File.open(__FILE__, 'r') do |f|
         expect(f.ai(plain: true)).to eq("#{f.inspect}\n" + `ls -alF #{f.path}`.chop)
       end
     end
 
-    it 'displays a file (plain) akin to powershell Get-ChildItem', mswin: true do
+    it 'displays a file (plain) akin to powershell Get-ChildItem', :mswin do
       File.open(__FILE__, 'r') do |f|
         expect(f.ai(plain: true)).to eq("#{f.inspect}\n" + AmazingPrint::Formatters::GetChildItem.new(f.path).to_s)
       end
@@ -514,13 +514,13 @@
 
   #------------------------------------------------------------------------------
   describe 'Dir' do
-    it 'displays a direcory (plain)', unix: true do
+    it 'displays a direcory (plain)', :unix do
       Dir.open(File.dirname(__FILE__)) do |d|
         expect(d.ai(plain: true)).to eq("#{d.inspect}\n" + `ls -alF #{d.path}`.chop)
       end
     end
 
-    it 'displays a directory (plain) akin to powershell Get-ChildItem', mswin: true do
+    it 'displays a directory (plain) akin to powershell Get-ChildItem', :mswin do
       Dir.open(File.dirname(__FILE__)) do |d|
         expect(d.ai(plain: true)).to eq("#{d.inspect}\n" + AmazingPrint::Formatters::GetChildItem.new(d.path).to_s)
       end
@@ -684,7 +684,7 @@ class My < Hash; end
       EOS
     end
 
-    it 'inherited from File should be displayed as File', unix: true do
+    it 'inherited from File should be displayed as File', :unix do
       class My < File; end
 
       my = begin
@@ -695,21 +695,21 @@ class My < File; end
       expect(my.ai(plain: true)).to eq("#{my.inspect}\n" + `ls -alF #{my.path}`.chop)
     end
 
-    it 'inherited from File should be displayed as File', mswin: true do
+    it 'inherited from File should be displayed as File', :mswin do
       class My < File; end
       my = My.new('nul') # it's /dev/null in Windows
       expect(my.ai(plain: true)).to eq("#{my.inspect}\n" + AmazingPrint::Formatters::GetChildItem.new(my.path).to_s)
     end
 
-    it 'inherited from Dir should be displayed as Dir', unix: true do
+    it 'inherited from Dir should be displayed as Dir', :unix do
       class My < Dir; end
 
       require 'tmpdir'
       my = My.new(Dir.tmpdir)
       expect(my.ai(plain: true)).to eq("#{my.inspect}\n" + `ls -alF #{my.path}`.chop)
     end
 
-    it 'inherited from Dir are displayed as Dir', mswin: true do
+    it 'inherited from Dir are displayed as Dir', :mswin do
       class My < Dir; end
 
       require 'tmpdir'