From 9b51a3b4718b082301ff70b706ac53bec8668ac9 Mon Sep 17 00:00:00 2001 From: Tom Black Date: Fri, 28 Sep 2018 13:22:23 -0700 Subject: Color enhancements New shortcuts for setting color values, like `.color.r/g/b/a` and simply `.r/g/b/a`; allow the British English spelling "colour" --- test/color_spec.rb | 8 ++++-- test/renderable_spec.rb | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 test/renderable_spec.rb (limited to 'test') diff --git a/test/color_spec.rb b/test/color_spec.rb index 4ed21aa..4f0ec35 100644 --- a/test/color_spec.rb +++ b/test/color_spec.rb @@ -32,9 +32,13 @@ RSpec.describe Ruby2D::Color do s1.opacity = 0.5 s2 = Square.new(color: ['red', 'green', 'blue', 'yellow']) s2.opacity = 0.7 - expect(s1.opacity).to eq 0.5 - expect(s2.opacity).to eq 0.7 + expect(s1.opacity).to eq(0.5) + expect(s2.opacity).to eq(0.7) end end + it "allows British English spelling of color" do + expect(Ruby2D::Colour).to eq(Ruby2D::Color) + end + end diff --git a/test/renderable_spec.rb b/test/renderable_spec.rb new file mode 100644 index 0000000..56ee521 --- /dev/null +++ b/test/renderable_spec.rb @@ -0,0 +1,66 @@ +require 'ruby2d' + +RSpec.describe Ruby2D::Renderable do + + it "allows colors to be set on objects" do + quad = Quad.new + + quad.color = 'red' + expect(quad.color.r).to eq(1) + + quad.color = [0.9, 0.8, 0.7, 0.6] + expect(quad.color.r).to eq(0.9) + expect(quad.color.g).to eq(0.8) + expect(quad.color.b).to eq(0.7) + expect(quad.color.a).to eq(0.6) + + quad.color.r = 0.1 + quad.color.g = 0.2 + quad.color.b = 0.3 + quad.color.a = 0.4 + expect(quad.color.r).to eq(0.1) + expect(quad.color.g).to eq(0.2) + expect(quad.color.b).to eq(0.3) + expect(quad.color.a).to eq(0.4) + + quad.r = 0.5 + quad.g = 0.6 + quad.b = 0.7 + quad.a = 0.8 + expect(quad.r).to eq(0.5) + expect(quad.g).to eq(0.6) + expect(quad.b).to eq(0.7) + expect(quad.a).to eq(0.8) + end + + it "allows British English spelling of color (colour)" do + quad = Quad.new + + quad.colour = 'blue' + expect(quad.color.r).to eq(0) + + quad.colour = [0.1, 0.2, 0.3, 0.4] + expect(quad.color.r).to eq(0.1) + expect(quad.color.g).to eq(0.2) + expect(quad.color.b).to eq(0.3) + expect(quad.color.a).to eq(0.4) + + quad.colour.r = 0.9 + quad.colour.g = 0.8 + quad.colour.b = 0.7 + quad.colour.a = 0.6 + expect(quad.colour.r).to eq(0.9) + expect(quad.colour.g).to eq(0.8) + expect(quad.colour.b).to eq(0.7) + expect(quad.colour.a).to eq(0.6) + expect(quad.color.r).to eq(0.9) + expect(quad.color.g).to eq(0.8) + expect(quad.color.b).to eq(0.7) + expect(quad.color.a).to eq(0.6) + expect(quad.r).to eq(0.9) + expect(quad.g).to eq(0.8) + expect(quad.b).to eq(0.7) + expect(quad.a).to eq(0.6) + end + +end -- cgit v1.2.3