From 3773a972aa801d0b4d09c51b4be1f6354ee59240 Mon Sep 17 00:00:00 2001 From: ollie beney Date: Thu, 5 Nov 2020 12:49:20 +0000 Subject: [PATCH] actually fixed special item this time, feature tests also fixed --- ruby/lib/gilded_rose.rb | 4 ++-- ruby/spec/gilded_rose_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruby/lib/gilded_rose.rb b/ruby/lib/gilded_rose.rb index 1391ab70..69c77120 100644 --- a/ruby/lib/gilded_rose.rb +++ b/ruby/lib/gilded_rose.rb @@ -6,7 +6,7 @@ class GildedRose def self.update_quality(items) items.map do |item| - if item.name != "Aged Brie" and item.name != "Backstage passes to a TAFKAL80ETC concert" + if !special_item?(item) update_normal_quality(item) if !sulfuras?(item) @@ -68,7 +68,7 @@ class GildedRose end def self.special_item?(item) - item.name.downcase.match( /Aged Brie/ || /backstage/).nil? || sulfuras?(item) + ( !item.name.downcase.match( /aged brie/).nil? || !item.name.downcase.match(/backstage/).nil? || sulfuras?(item)) end end diff --git a/ruby/spec/gilded_rose_spec.rb b/ruby/spec/gilded_rose_spec.rb index f8db334d..79ec78f2 100644 --- a/ruby/spec/gilded_rose_spec.rb +++ b/ruby/spec/gilded_rose_spec.rb @@ -131,7 +131,7 @@ let(:sulfarus) { Item.new('Sulfuras, Hand of Ragnaros', 50, 80) } it 'returns false on potato' do item_double = double :item, name: "potato" - expect(GildedRose.sulfuras?(item_double)).to eq false + expect(GildedRose.special_item?(item_double)).to eq false end end