generator_spec.rb in namey-0.0.12

- old
+ new

@@ -1,10 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Namey::Generator" do
   before(:each) do
-    @uri = "#{'jdbc:' if RUBY_PLATFORM == 'java'}sqlite:/"
+    #@uri = "#{'jdbc:' if RUBY_PLATFORM == 'java'}#{Namey.db_path}"
+    @uri = Namey.db_path
     @gen = Namey::Generator.new(@uri)
   end
 
   describe "incoming sequel object" do
     it "should work" do
@@ -13,49 +14,59 @@
     end
   end
   
   describe "name" do
     it "should pass params to generate" do
-      @gen.should_receive(:generate).with(:frequency => :common, :with_surname => true)
+      expect(@gen).to receive(:generate).with(:frequency => :common, :with_surname => true)
       @gen.name
     end
   end
 
   describe "male" do
     it "should pass params to generate" do
-      @gen.should_receive(:generate).with(:type => :male, :frequency => :common, :with_surname => true)
+      expect(@gen).to receive(:generate).with(:type => :male, :frequency => :common, :with_surname => true)
       @gen.male
     end
   end
 
   describe "female" do
     it "should pass params to generate" do
-      @gen.should_receive(:generate).with(:type => :female, :frequency => :common, :with_surname => true)
+      expect(@gen).to receive(:generate).with(:type => :female, :frequency => :common, :with_surname => true)
       @gen.female
     end
   end
 
   describe "surname" do
     it "should pass params to generate" do
-      @gen.should_receive(:generate).with(:type => :surname, :frequency => :common)
+      expect(@gen).to receive(:generate).with(:type => :surname, :frequency => :common)
       @gen.surname
     end
   end
 
   describe "generate" do
     it "should pass to get_name once for surnames" do
-      @gen.should_receive(:get_name).with(:surname, 0, 20).and_return("Chuck")
-      @gen.generate(:type => :surname).should == "Chuck"
+      expect(@gen).to receive(:get_name).with(:surname, 0, 20).and_return("Chuck")
+      expect(@gen.generate(:type => :surname)).to eq("Chuck")
     end
 
     it "should pass to get_name once when with_surname is false" do
-      @gen.should_receive(:get_name).with(:male, 0, 20).and_return("Chuck")
-      @gen.generate(:type => :male, :with_surname => false).should == "Chuck"
+      expect(@gen).to receive(:get_name).with(:male, 0, 20).and_return("Chuck")
+      expect(@gen.generate(:type => :male, :with_surname => false)).to eq("Chuck")
     end
 
     it "should pass to get_name twice for full names" do
-      @gen.should_receive(:get_name).with(:male, 0, 20).and_return("Chuck")      
-      @gen.should_receive(:get_name).with(:surname, 0, 20).and_return("Smith")
-      @gen.generate(:type => :male).should == "Chuck Smith"
+      expect(@gen).to receive(:get_name).with(:male, 0, 20).and_return("Chuck")
+      expect(@gen).to receive(:get_name).with(:surname, 0, 20).and_return("Smith")
+      expect(@gen.generate(:type => :male)).to eq("Chuck Smith")
     end
+
+    it "should work" do
+      expect(@gen.generate).to_not be_nil
+    end
+
+    it "should work even for bad frequencies" do
+      expect(@gen.generate(:frequency => :foo)).to_not be_nil
+      expect(@gen.generate(:min_freq => 50, :max_freq => 2)).to_not be_nil
+    end
   end
+
 end