Use named arguments (#65)

1 files changed, 19 insertions, 50 deletions

diff --git a/test/triangle_spec.rb b/test/triangle_spec.rb
index b562e59..045f9f3 100644
--- a/test/triangle_spec.rb
+++ b/test/triangle_spec.rb
@@ -3,11 +3,7 @@ require 'ruby2d'
 RSpec.describe Ruby2D::Triangle do
   describe '#new' do
     it "creates a triangle with white color by default" do
-      triangle = Triangle.new(
-        320,  50,
-        540, 430,
-        100, 430
-      )
+      triangle = Triangle.new
       expect(triangle.color).to   be_a(Ruby2D::Color)
       expect(triangle.color.r).to eq(1)
       expect(triangle.color.g).to eq(1)
@@ -16,66 +12,40 @@ RSpec.describe Ruby2D::Triangle do
     end
 
     it 'creates a new triangle with one color via string' do
-      triangle = Triangle.new(
-        320,  50,
-        540, 430,
-        100, 430,
-        "black"
-      )
-
+      triangle = Triangle.new(color: "black")
       expect(triangle.color).to be_a(Ruby2D::Color)
     end
 
     it "creates a new triangle with one color via array of numbers" do
-      triangle = Triangle.new(
-        320,  50,
-        540, 430,
-        100, 430,
-        [0.1, 0.3, 0.5, 0.7]
-      )
-
+      triangle = Triangle.new(color: [0.1, 0.3, 0.5, 0.7])
       expect(triangle.color).to be_a(Ruby2D::Color)
     end
 
     it "creates a new triangle with 3 colors via array of 3 strings" do
-      triangle = Triangle.new(
-        320,  50,
-        540, 430,
-        100, 430,
-        ["red", "green", "blue"]
-      )
+      triangle = Triangle.new(color: ["red", "green", "blue"])
       expect(triangle.color).to be_a(Ruby2D::Color::Set)
     end
 
     it "creates a new triangle with 3 colors via array of 3 arrays of arrays of numbers" do
       triangle = Triangle.new(
-        320,  50,
-        540, 430,
-        100, 430,
-        [[0.1, 0.3, 0.5, 0.7], [0.2, 0.4, 0.6, 0.8], [0.3, 0.5, 0.7, 0.9]]
+        color: [
+          [0.1, 0.3, 0.5, 0.7],
+          [0.2, 0.4, 0.6, 0.8],
+          [0.3, 0.5, 0.7, 0.9]
+        ]
       )
       expect(triangle.color).to be_a(Ruby2D::Color::Set)
     end
 
     it "throws an error when array of 2 strings is passed" do
       expect do
-        Triangle.new(
-          320,  50,
-          540, 430,
-          100, 430,
-          ["red", "green"]
-        )
+        Triangle.new(color: ["red", "green"])
       end.to raise_error("Triangles require 3 colors, one for each vertex. 2 were given.")
     end
 
     it "throws an error when array of 4 strings is passed" do
       expect do
-        Triangle.new(
-          320,  50,
-          540, 430,
-          100, 430,
-          ["red", "green", "blue", "fuchsia"]
-        )
+        Triangle.new(color: ["red", "green", "blue", "fuchsia"])
       end.to raise_error("Triangles require 3 colors, one for each vertex. 4 were given.")
     end
   end
@@ -84,22 +54,21 @@ RSpec.describe Ruby2D::Triangle do
   describe '#contains?' do
     it "returns true if point is inside triangle" do
       triangle = Triangle.new(
-        0, 0,
-        0, 100,
-        100, 0
+        x1:   0, y1:   0,
+        x2:   0, y2: 100,
+        x3: 100, y3:   0
       )
       expect(triangle.contains?(25, 25)).to be true
     end
 
     it "returns true if point is inside text" do
       triangle = Triangle.new(
-        0, 0,
-        0, 100,
-        100, 0
+        x1:   0, y1:   0,
+        x2:   0, y2: 100,
+        x3: 100, y3:   0
       )
-
-      expect(triangle.contains?(25, -25)).to be false
-      expect(triangle.contains?(-25, 25)).to be false
+      expect(triangle.contains?( 25, -25)).to be false
+      expect(triangle.contains?(-25,  25)).to be false
       expect(triangle.contains?(100, 100)).to be false
     end
   end