Merge branch '__rultor'

yegor256 · May 28, 2019 · a2d7dc4 · a2d7dc4
2 parents 63c88b5 + 08f3000
commit a2d7dc4
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 1 deletion.
diff --git a/objects/maybe_text.rb b/objects/maybe_text.rb
@@ -29,7 +29,7 @@ def initialize(text_if_present, maybe, exclude_if = false)
   end
 
   def to_s
-    if @maybe.nil? || @maybe.empty? || @maybe <=> @exclude_if
+    if @maybe.nil? || @maybe.empty? || @maybe == @exclude_if
       ''
     else
       @text

diff --git a/test/test_github_tickets.rb b/test/test_github_tickets.rb
@@ -112,6 +112,41 @@ class << github
     assert(github.body.start_with?('The puzzle `55-ab536de` from #123 has'))
   end
 
+  def test_output_estimates_when_it_is_not_zero
+    sources = Object.new
+    def sources.config
+      YAML.safe_load("\n\n")
+    end
+    require_relative 'fake_github'
+    github = FakeGithub.new
+    def github.create_issue(_, title, body)
+      @title = title
+      @body = body
+      { 'number' => 555 }
+    end
+    class << github
+      attr_accessor :body, :title
+    end
+    tickets = GithubTickets.new('yegor256/0pdd', github, sources)
+    tickets.submit(
+      Nokogiri::XML(
+        '<puzzle>
+          <id>55-ab536de</id>
+          <file>/a/bz.txt</file>
+          <time>01-05-2017</time>
+          <author>yegor</author>
+          <body>как дела? hey, how are you, please see this title!</body>
+          <ticket>123</ticket>
+          <estimate>10</estimate>
+          <role>DEV</role>
+          <lines>1-3</lines>
+        </puzzle>'
+      ).xpath('/puzzle')
+    )
+    assert(github.body.start_with?('The puzzle `55-ab536de` from #123 has'))
+    assert(github.body.include?('Estimate:'))
+  end
+
   def test_skips_estimate_if_0
     sources = Object.new
     def sources.config

diff --git a/test/test_maybe_text.rb b/test/test_maybe_text.rb
@@ -39,4 +39,8 @@ def test_excluded_input_then_blank
   def test_present_input_then_output
     assert_equal('output', MaybeText.new('output', 'input').to_s)
   end
+
+  def test_show_output_when_exclude_if_is_present
+    assert_equal('output', MaybeText.new('output', 'input', 'output').to_s)
+  end
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ def initialize(text_if_present, maybe, exclude_if = false) @@
       end
       def to_s
-        if @maybe.nil? || @maybe.empty? || @maybe <=> @exclude_if
+        if @maybe.nil? || @maybe.empty? || @maybe == @exclude_if
           ''
         else
           @text
@@ Expand Down @@