Merge pull request #555 from crystal-ameba/refactors-before-1.7-release

spec/ameba/ast/flow_expression_spec.cr

@@ -52,7 +52,7 @@ module Ameba::AST
             CRYSTAL
           node = nodes.expressions_nodes.first
           flow_expression = FlowExpression.new node, false
-          flow_expression.unreachable_nodes.empty?.should eq true
+          flow_expression.unreachable_nodes.empty?.should be_true
         end
 
         it "returns nil if there is no unreachable node" do
@@ -64,7 +64,7 @@ module Ameba::AST
             CRYSTAL
           node = nodes.expressions_nodes.first
           flow_expression = FlowExpression.new node, false
-          flow_expression.unreachable_nodes.empty?.should eq true
+          flow_expression.unreachable_nodes.empty?.should be_true
         end
       end
     end

spec/ameba/ast/util_spec.cr

@@ -5,9 +5,9 @@ module Ameba::AST
     include Util
   end
 
-  subject = Test.new
-
   describe Util do
+    subject = Test.new
+
     describe "#literal?" do
       [
         Crystal::ArrayLiteral.new,
@@ -120,12 +120,12 @@ module Ameba::AST
     describe "#flow_command?" do
       it "returns true if this is return" do
         node = as_node("return 22")
-        subject.flow_command?(node, false).should eq true
+        subject.flow_command?(node, false).should be_true
       end
 
       it "returns true if this is a break in a loop" do
         node = as_node("break")
-        subject.flow_command?(node, true).should eq true
+        subject.flow_command?(node, true).should be_true
       end
 
       it "returns false if this is a break out of loop" do
@@ -135,7 +135,7 @@ module Ameba::AST
 
       it "returns true if this is a next in a loop" do
         node = as_node("next")
-        subject.flow_command?(node, true).should eq true
+        subject.flow_command?(node, true).should be_true
       end
 
       it "returns false if this is a next out of loop" do
@@ -145,17 +145,17 @@ module Ameba::AST
 
       it "returns true if this is raise" do
         node = as_node("raise e")
-        subject.flow_command?(node, false).should eq true
+        subject.flow_command?(node, false).should be_true
       end
 
       it "returns true if this is exit" do
         node = as_node("exit")
-        subject.flow_command?(node, false).should eq true
+        subject.flow_command?(node, false).should be_true
       end
 
       it "returns true if this is abort" do
         node = as_node("abort")
-        subject.flow_command?(node, false).should eq true
+        subject.flow_command?(node, false).should be_true
       end
 
       it "returns false otherwise" do
@@ -167,7 +167,7 @@ module Ameba::AST
     describe "#flow_expression?" do
       it "returns true if this is a flow command" do
         node = as_node("return")
-        subject.flow_expression?(node, true).should eq true
+        subject.flow_expression?(node, true).should be_true
       end
 
       it "returns true if this is if-else consumed by flow expressions" do
@@ -178,7 +178,7 @@ module Ameba::AST
             return :bar
           end
           CRYSTAL
-        subject.flow_expression?(node, false).should eq true
+        subject.flow_expression?(node, false).should be_true
       end
 
       it "returns true if this is unless-else consumed by flow expressions" do
@@ -189,7 +189,7 @@ module Ameba::AST
             return :bar
           end
           CRYSTAL
-        subject.flow_expression?(node).should eq true
+        subject.flow_expression?(node).should be_true
       end
 
       it "returns true if this is case consumed by flow expressions" do
@@ -203,7 +203,7 @@ module Ameba::AST
             return 3
           end
           CRYSTAL
-        subject.flow_expression?(node).should eq true
+        subject.flow_expression?(node).should be_true
       end
 
       it "returns true if this is exception handler consumed by flow expressions" do
@@ -214,7 +214,7 @@ module Ameba::AST
             return e
           end
           CRYSTAL
-        subject.flow_expression?(node).should eq true
+        subject.flow_expression?(node).should be_true
       end
 
       it "returns true if this while consumed by flow expressions" do
@@ -223,7 +223,7 @@ module Ameba::AST
             return
           end
           CRYSTAL
-        subject.flow_expression?(node).should eq true
+        subject.flow_expression?(node).should be_true
       end
 
       it "returns false if this while with break" do
@@ -241,7 +241,7 @@ module Ameba::AST
             return
           end
           CRYSTAL
-        subject.flow_expression?(node).should eq true
+        subject.flow_expression?(node).should be_true
       end
 
       it "returns false if this until with break" do
@@ -259,7 +259,7 @@ module Ameba::AST
           exp2
           return
           CRYSTAL
-        subject.flow_expression?(node).should eq true
+        subject.flow_expression?(node).should be_true
       end
 
       it "returns false otherwise" do
@@ -274,7 +274,7 @@ module Ameba::AST
     describe "#raise?" do
       it "returns true if this is a raise method call" do
         node = as_node "raise e"
-        subject.raise?(node).should eq true
+        subject.raise?(node).should be_true
       end
 
       it "returns false if it has a receiver" do
@@ -291,12 +291,12 @@ module Ameba::AST
     describe "#exit?" do
       it "returns true if this is a exit method call" do
         node = as_node "exit"
-        subject.exit?(node).should eq true
+        subject.exit?(node).should be_true
       end
 
       it "returns true if this is a exit method call with one argument" do
         node = as_node "exit 1"
-        subject.exit?(node).should eq true
+        subject.exit?(node).should be_true
       end
 
       it "returns false if it has a receiver" do
@@ -313,17 +313,17 @@ module Ameba::AST
     describe "#abort?" do
       it "returns true if this is an abort method call" do
         node = as_node "abort"
-        subject.abort?(node).should eq true
+        subject.abort?(node).should be_true
       end
 
       it "returns true if this is an abort method call with one argument" do
         node = as_node "abort \"message\""
-        subject.abort?(node).should eq true
+        subject.abort?(node).should be_true
       end
 
       it "returns true if this is an abort method call with two arguments" do
         node = as_node "abort \"message\", 1"
-        subject.abort?(node).should eq true
+        subject.abort?(node).should be_true
       end
 
       it "returns false if it has a receiver" do
@@ -340,7 +340,7 @@ module Ameba::AST
     describe "#loop?" do
       it "returns true if this is a loop method call" do
         node = as_node "loop"
-        subject.loop?(node).should eq true
+        subject.loop?(node).should be_true
       end
 
       it "returns false if it has a receiver" do

spec/ameba/ast/variabling/reference_spec.cr

@@ -4,7 +4,8 @@ module Ameba::AST
   describe Reference do
     it "is derived from a Variable" do
       node = Crystal::Var.new "foo"
-      Reference.new(node, Scope.new as_node "foo = 1").is_a?(Variable).should be_true
+      ref = Reference.new(node, Scope.new as_node "foo = 1")
+      ref.should be_a Variable
     end
   end
 end

spec/ameba/cli/cmd_spec.cr

@@ -66,7 +66,7 @@ module Ameba::Cli
 
       it "accepts --rules flag" do
         c = Cli.parse_args %w[--rules]
-        c.rules?.should eq true
+        c.rules?.should be_true
       end
 
       it "defaults all? flag to false" do
@@ -76,7 +76,7 @@ module Ameba::Cli
 
       it "accepts --all flag" do
         c = Cli.parse_args %w[--all]
-        c.all?.should eq true
+        c.all?.should be_true
       end
 
       it "accepts --gen-config flag" do

spec/ameba/formatter/disabled_formatter_spec.cr

@@ -5,6 +5,10 @@ module Ameba::Formatter
     output = IO::Memory.new
     subject = DisabledFormatter.new output
 
+    before_each do
+      output.clear
+    end
+
     describe "#finished" do
       it "writes a final message" do
         subject.finished [Source.new ""]
@@ -24,7 +28,6 @@ module Ameba::Formatter
         log.should contain "#{path}:1 #{ErrorRule.rule_name}"
         log.should contain "#{path}:2 #{NamedRule.rule_name}"
       ensure
-        output.clear
         Colorize.enabled = true
       end
 

spec/ameba/formatter/explain_formatter_spec.cr

@@ -1,21 +1,24 @@
 require "../../spec_helper"
 
-module Ameba
-  def explanation(source)
-    output = IO::Memory.new
-    ErrorRule.new.catch(source)
-    location = {file: "source.cr", line: 1, column: 1}
-    Formatter::ExplainFormatter.new(output, location).finished([source])
-    output.to_s
-  end
+private LOCATION = {file: "source.cr", line: 1, column: 1}
+
+private def explanation(source)
+  Ameba::ErrorRule.new.catch(source)
 
-  describe Formatter::ExplainFormatter do
+  output = IO::Memory.new
+  Ameba::Formatter::ExplainFormatter.new(output, LOCATION).finished([source])
+  output.to_s
+end
+
+module Ameba::Formatter
+  describe ExplainFormatter do
     describe "#location" do
       it "returns crystal location" do
-        location = Formatter::ExplainFormatter
-          .new(STDOUT, {file: "compiler.cr", line: 3, column: 8}).location
+        location = ExplainFormatter
+          .new(STDOUT, {file: "compiler.cr", line: 3, column: 8})
+          .location
 
-        location.is_a?(Crystal::Location).should be_true
+        location.should be_a Crystal::Location
         location.filename.should eq "compiler.cr"
         location.line_number.should eq 3
         location.column_number.should eq 8
@@ -24,8 +27,10 @@ module Ameba
 
     describe "#output" do
       it "returns io" do
-        output = Formatter::ExplainFormatter
-          .new(STDOUT, {file: "compiler.cr", line: 3, column: 8}).output
+        output = ExplainFormatter
+          .new(STDOUT, {file: "compiler.cr", line: 3, column: 8})
+          .output
+
         output.should eq STDOUT
       end
     end

spec/ameba/formatter/flycheck_formatter_spec.cr

@@ -1,15 +1,16 @@
 require "../../spec_helper"
 
-private def flycheck
-  output = IO::Memory.new
-  Ameba::Formatter::FlycheckFormatter.new output
-end
-
 module Ameba::Formatter
   describe FlycheckFormatter do
+    output = IO::Memory.new
+    subject = FlycheckFormatter.new output
+
+    before_each do
+      output.clear
+    end
+
     context "problems not found" do
       it "reports nothing" do
-        subject = flycheck
         subject.source_finished Source.new ""
         subject.output.to_s.empty?.should be_true
       end
@@ -19,7 +20,7 @@ module Ameba::Formatter
       it "reports an issue" do
         s = Source.new "a = 1", "source.cr"
         s.add_issue DummyRule.new, {1, 2}, "message"
-        subject = flycheck
+
         subject.source_finished s
         subject.output.to_s.should eq(
           "source.cr:1:2: C: [#{DummyRule.rule_name}] message\n"
@@ -29,7 +30,7 @@ module Ameba::Formatter
       it "properly reports multi-line message" do
         s = Source.new "a = 1", "source.cr"
         s.add_issue DummyRule.new, {1, 2}, "multi\nline"
-        subject = flycheck
+
         subject.source_finished s
         subject.output.to_s.should eq(
           "source.cr:1:2: C: [#{DummyRule.rule_name}] multi line\n"
@@ -39,7 +40,7 @@ module Ameba::Formatter
       it "reports nothing if location was not set" do
         s = Source.new "a = 1", "source.cr"
         s.add_issue DummyRule.new, Crystal::Nop.new, "message"
-        subject = flycheck
+
         subject.source_finished s
         subject.output.to_s.should eq ""
       end

spec/ameba/formatter/github_actions_formatter_spec.cr

@@ -24,7 +24,10 @@ module Ameba::Formatter
         source.add_issue DummyRule.new, location, location, "message\n2nd line"
 
         subject.source_finished(source)
-        output.to_s.should eq("::notice file=/path/to/file.cr,line=1,col=2,endLine=1,endColumn=2,title=Ameba/DummyRule::message%0A2nd line\n")
+        output.to_s.should eq(
+          "::notice file=/path/to/file.cr,line=1,col=2,endLine=1,endColumn=2," \
+          "title=Ameba/DummyRule::message%0A2nd line\n"
+        )
       end
     end
 
@@ -78,8 +81,14 @@ module Ameba::Formatter
             summary.should contain "### Issues found:"
             summary.should contain "#### `src/source.cr` (**2** issues)"
             if repo && sha
-              summary.should contain "| [1-2](https://github.com/#{repo}/blob/#{sha}/src/source.cr#L1-L2) | Convention | Ameba/DummyRule | DummyRuleError |"
-              summary.should contain "| [1](https://github.com/#{repo}/blob/#{sha}/src/source.cr#L1) | Convention | Ameba/DummyRule | DummyRuleError 2 |"
+              summary.should contain(
+                "| [1-2](https://github.com/#{repo}/blob/#{sha}/src/source.cr#L1-L2) " \
+                "| Convention | Ameba/DummyRule | DummyRuleError |"
+              )
+              summary.should contain(
+                "| [1](https://github.com/#{repo}/blob/#{sha}/src/source.cr#L1) " \
+                "| Convention | Ameba/DummyRule | DummyRuleError 2 |"
+              )
             else
               summary.should contain "| 1-2 | Convention | Ameba/DummyRule | DummyRuleError |"
               summary.should contain "| 1 | Convention | Ameba/DummyRule | DummyRuleError 2 |"