Merge e08ecb0 into 7184dca

sue445 · Jan 2, 2014 · 9eb14b5 · 9eb14b5
2 parents 7184dca + e08ecb0
commit 9eb14b5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/lib/rubicure/core.rb b/lib/rubicure/core.rb
@@ -37,7 +37,7 @@ def all_stars
           @all_stars << Rubicure::Girl.find(girl_name)
         end
 
-        @all_stars.uniq!{|girl| girl.precure_name }
+        @all_stars.uniq!{|girl| girl.human_name }
       end
 
       @all_stars

diff --git a/spec/core_spec.rb b/spec/core_spec.rb
@@ -54,4 +54,19 @@
 
     it{ expect{|b| instance.each_with_series(&b) }.to yield_successive_args *@expected_series }
   end
+
+  describe "#all_stars" do
+    subject{ instance.all_stars }
+
+    before do
+      human_names = []
+      config_file = "#{File.dirname(__FILE__)}/../config/girls.yml"
+      Pathname(config_file).each_line do |line|
+        human_names << $1 if line =~ /human_name:\s*(.+)\s*/
+      end
+      @precure_count = human_names.uniq.count
+    end
+
+    its(:count){ should == @precure_count }
+  end
 end
diff --git a/spec/rubicure_spec.rb b/spec/rubicure_spec.rb
@@ -109,18 +109,4 @@
       it{ expect( Milky.rose.precure_name ).to eq "ミルキィローズ"}
     end
   end
-
-  describe "#all_stars" do
-    subject{ Precure.all_stars }
-
-    before do
-      @precure_count = 0
-      config_file = "#{File.dirname(__FILE__)}/../config/girls.yml"
-      Pathname(config_file).each_line do |line|
-        @precure_count += 1 if line =~ /[a-z_]+:\s*&[a-z_]+/
-      end
-    end
-
-    its(:count){ should == @precure_count }
-  end
 end