judges 0.47.0 → 0.49.0

data/test/commands/test_download.rb

@@ -20,11 +20,12 @@ class TestDownload < Minitest::Test
     stub_request(:get, 'https://example.org/durables/find?file=downloaded.txt&jname=myjudge').to_return(
       status: 200, body: '42'
     )
-    stub_request(:get, 'https://example.org/durables/42/lock?owner=default').to_return(status: 302)
+    stub_request(:get, 'https://example.org/csrf').to_return(body: 'test-csrf-token')
+    stub_request(:post, %r{https://example.org/durables/42/lock}).to_return(status: 302)
     stub_request(:get, 'https://example.org/durables/42').to_return(
-      status: 200, body: content
+      status: 200, body: content, headers: {}
     )
-    stub_request(:get, 'https://example.org/durables/42/unlock?owner=default').to_return(status: 302)
+    stub_request(:post, %r{https://example.org/durables/42/unlock}).to_return(status: 302)
     Dir.mktmpdir do |d|
       file = File.join(d, 'downloaded.txt')
       Judges::Download.new(Loog::NULL).run(
@@ -44,14 +45,15 @@ class TestDownload < Minitest::Test
   def test_download_with_custom_owner
     WebMock.disable_net_connect!
     content = 'Custom content'
-    stub_request(:get, 'http://example.org/durables/find?file=data.bin&jname=judge1').to_return(
+    stub_request(:get, %r{http://example.org/durables/find}).to_return(
       status: 200, body: '123'
     )
-    stub_request(:get, 'http://example.org/durables/123/lock?owner=custom').to_return(status: 302)
+    stub_request(:get, 'http://example.org/csrf').to_return(body: 'test-csrf-token')
+    stub_request(:post, %r{http://example.org/durables/123/lock}).to_return(status: 302)
     stub_request(:get, 'http://example.org/durables/123').to_return(
-      status: 200, body: content
+      status: 200, body: content, headers: {}
     )
-    stub_request(:get, 'http://example.org/durables/123/unlock?owner=custom').to_return(status: 302)
+    stub_request(:post, %r{http://example.org/durables/123/unlock}).to_return(status: 302)
     Dir.mktmpdir do |d|
       file = File.join(d, 'data.bin')
       Judges::Download.new(Loog::NULL).run(
@@ -73,9 +75,10 @@ class TestDownload < Minitest::Test
     stub_request(:get, 'http://example.org/durables/find?file=test.txt&jname=somejudge').to_return(
       status: 200, body: '99'
     )
-    stub_request(:get, 'http://example.org/durables/99/lock?owner=none').to_return(status: 302)
+    stub_request(:get, 'http://example.org/csrf').to_return(body: 'test-csrf-token')
+    stub_request(:post, %r{http://example.org/durables/99/lock}).to_return(status: 302)
     stub_request(:get, 'http://example.org/durables/99').to_return(status: 404)
-    stub_request(:get, 'http://example.org/durables/99/unlock?owner=none').to_return(status: 302)
+    stub_request(:post, %r{http://example.org/durables/99/unlock}).to_return(status: 302)
     Dir.mktmpdir do |d|
       file = File.join(d, 'test.txt')
       assert_raises(StandardError) do

data/test/commands/test_print.rb

@@ -79,6 +79,35 @@ class TestPrint < Minitest::Test
     assert_empty(v.errors, "#{doc}\n\n#{v.errors.join('; ')}")
   end
 
+  def test_html_table_has_colgroup
+    WebMock.disable_net_connect!
+    stub_request(:get, 'https://yegor256.github.io/judges/assets/index.css').to_return(body: 'nothing')
+    stub_request(:get, 'https://yegor256.github.io/judges/assets/index.js').to_return(body: 'nothing')
+    fb = Factbase.new
+    f = fb.insert
+    f.what = 'test issue'
+    f.when = Time.now
+    f.ticket = 42
+    html = File.join(__dir__, '../../temp/colgroup_test.html')
+    FileUtils.rm_f(html)
+    Dir.mktmpdir do |d|
+      factbase_file = File.join(d, 'base.fb')
+      File.binwrite(factbase_file, fb.export)
+      Judges::Print.new(Loog::NULL).run(
+        { 'format' => 'html', 'columns' => 'what,when,ticket' },
+        [factbase_file, html]
+      )
+    end
+    doc = Nokogiri::HTML(File.read(html))
+    table = doc.at_css('table#facts')
+    refute_nil(table, 'Table with id="facts" should exist')
+    colgroup = table.at_css('colgroup')
+    refute_nil(colgroup, 'Table should have a colgroup element')
+    cols = colgroup.css('col')
+    assert_equal(4, cols.size, 'Should have 4 col elements (3 for columns + 1 for extra)')
+    assert_equal('w50', cols.last['class'], 'Last col should have class="w50"')
+  end
+
   def test_print_all_formats
     WebMock.disable_net_connect!
     stub_request(:get, 'https://yegor256.github.io/judges/assets/index.css').to_return(body: 'nothing')

data/test/commands/test_pull.rb

@@ -17,15 +17,16 @@ require_relative '../test__helper'
 class TestPull < Minitest::Test
   def test_pull_simple_factbase
     WebMock.disable_net_connect!
-    stub_request(:get, 'http://example.org/lock/foo?owner=none').to_return(status: 302)
+    stub_request(:get, 'http://example.org/csrf').to_return(body: 'test-csrf-token')
+    stub_request(:post, %r{http://example.org/lock/foo}).to_return(status: 302)
     stub_request(:get, 'http://example.org/exists/foo').to_return(body: 'yes')
     stub_request(:get, 'http://example.org/recent/foo.txt').to_return(body: '42')
     stub_request(:get, 'http://example.org/finished/42').to_return(body: 'yes')
     stub_request(:get, 'http://example.org/exit/42.txt').to_return(body: '0')
-    stub_request(:get, 'http://example.org/unlock/foo?owner=none').to_return(status: 302)
+    stub_request(:post, %r{http://example.org/unlock/foo}).to_return(status: 302)
     fb = Factbase.new
     fb.insert.foo = 42
-    stub_request(:get, 'http://example.org/pull/42.fb').to_return(body: fb.export)
+    stub_request(:get, 'http://example.org/pull/42.fb').to_return(body: fb.export, headers: {})
     Dir.mktmpdir do |d|
       file = File.join(d, 'base.fb')
       Judges::Pull.new(Loog::NULL).run(
@@ -46,13 +47,14 @@ class TestPull < Minitest::Test
 
   def test_fail_pull_when_job_is_broken
     WebMock.disable_net_connect!
-    stub_request(:get, 'http://example.org/lock/foo?owner=none').to_return(status: 302)
+    stub_request(:get, 'http://example.org/csrf').to_return(body: 'test-csrf-token')
+    stub_request(:post, %r{http://example.org/lock/foo}).to_return(status: 302)
     stub_request(:get, 'http://example.org/exists/foo').to_return(body: 'yes')
     stub_request(:get, 'http://example.org/recent/foo.txt').to_return(body: '42')
     stub_request(:get, 'http://example.org/finished/42').to_return(body: 'yes')
     stub_request(:get, 'http://example.org/exit/42.txt').to_return(body: '1')
     stub_request(:get, 'http://example.org/stdout/42.txt').to_return(body: 'oops, some trouble here')
-    stub_request(:get, 'http://example.org/unlock/foo?owner=none').to_return(status: 302)
+    stub_request(:post, %r{http://example.org/unlock/foo}).to_return(status: 302)
     Dir.mktmpdir do |d|
       file = File.join(d, 'base.fb')
       e =

data/test/commands/test_push.rb

@@ -16,8 +16,9 @@ require_relative '../test__helper'
 class TestPush < Minitest::Test
   def test_push_simple_factbase
     WebMock.disable_net_connect!
-    stub_request(:get, 'https://example.org/lock/foo?owner=none').to_return(status: 302)
-    stub_request(:get, 'https://example.org/unlock/foo?owner=none').to_return(status: 302)
+    stub_request(:get, 'https://example.org/csrf').to_return(body: 'test-csrf-token')
+    stub_request(:post, %r{https://example.org/lock/foo}).to_return(status: 302)
+    stub_request(:post, %r{https://example.org/unlock/foo}).to_return(status: 302)
     stub_request(:put, 'https://example.org/push/foo').to_return(
       status: 200, body: '42'
     )
@@ -52,9 +53,10 @@ class TestPush < Minitest::Test
 
   def test_fails_on_http_error
     WebMock.disable_net_connect!
-    stub_request(:get, 'http://example.org/lock/foo?owner=none').to_return(status: 302)
+    stub_request(:get, 'http://example.org/csrf').to_return(body: 'test-csrf-token')
+    stub_request(:post, %r{http://example.org/lock/foo}).to_return(status: 302)
     stub_request(:put, 'http://example.org/push/foo').to_return(status: 500)
-    stub_request(:get, 'http://example.org/unlock/foo?owner=none').to_return(status: 302)
+    stub_request(:post, %r{http://example.org/unlock/foo}).to_return(status: 302)
     Dir.mktmpdir do |d|
       file = File.join(d, 'base.fb')
       fb = Factbase.new

data/test/commands/test_upload.rb

@@ -20,12 +20,13 @@ class TestUpload < Minitest::Test
     stub_request(:get, 'https://example.org/durables/find?file=upload.txt&jname=myjudge').to_return(
       status: 404
     )
-    stub_request(:get, 'https://example.org/csrf').to_return(
-      status: 200, body: 'test-csrf-token'
-    )
+    stub_request(:get, 'https://example.org/csrf').to_return(body: 'test-csrf-token')
     stub_request(:post, 'https://example.org/durables/place').to_return(
       status: 302, headers: { 'X-Zerocracy-DurableId' => '42' }
     )
+    stub_request(:post, %r{https://example.org/durables/42/lock}).to_return(status: 302)
+    stub_request(:put, %r{https://example.org/durables/42}).to_return(status: 200)
+    stub_request(:post, %r{https://example.org/durables/42/unlock}).to_return(status: 302)
     Dir.mktmpdir do |d|
       file = File.join(d, 'upload.txt')
       File.write(file, content)
@@ -48,9 +49,10 @@ class TestUpload < Minitest::Test
     stub_request(:get, 'http://example.org/durables/find?file=data.bin&jname=judge1').to_return(
       status: 200, body: '123'
     )
-    stub_request(:get, 'http://example.org/durables/123/lock?owner=custom').to_return(status: 302)
+    stub_request(:get, 'http://example.org/csrf').to_return(body: 'test-csrf-token')
+    stub_request(:post, %r{http://example.org/durables/123/lock}).to_return(status: 302)
     stub_request(:put, 'http://example.org/durables/123').to_return(status: 200)
-    stub_request(:get, 'http://example.org/durables/123/unlock?owner=custom').to_return(status: 302)
+    stub_request(:post, %r{http://example.org/durables/123/unlock}).to_return(status: 302)
     Dir.mktmpdir do |d|
       file = File.join(d, 'data.bin')
       File.write(file, content)
@@ -72,9 +74,7 @@ class TestUpload < Minitest::Test
     stub_request(:get, 'http://example.org/durables/find?file=test.txt&jname=somejudge').to_return(
       status: 404
     )
-    stub_request(:get, 'http://example.org/csrf').to_return(
-      status: 200, body: 'test-csrf-token'
-    )
+    stub_request(:get, 'http://example.org/csrf').to_return(body: 'test-csrf-token')
     stub_request(:post, 'http://example.org/durables/place').to_return(status: 500)
     Dir.mktmpdir do |d|
       file = File.join(d, 'test.txt')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judges
 version: !ruby/object:Gem::Version
-  version: 0.47.0
+  version: 0.49.0
 platform: ruby
 authors:
 - Yegor Bugayenko