url_spec.rb in firefly-1.3.0

- old
+ new

@@ -1,39 +1,39 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Url" do
-  
+
   describe "shortening" do
     it "should generate a code after create" do
       url = Firefly::Url.shorten("http://example.com/")
       Firefly::Url.first(:url => "http://example.com/").code.should_not be_nil
     end
-    
+
     it "should set a clicks count of 0 for newly shortened urls" do
       url = Firefly::Url.shorten("http://example.com/")
       Firefly::Url.first(:url => "http://example.com/").clicks.should eql(0)
     end
-    
+
     it "should create a new Firefly::Url with a new long_url" do
       lambda {
         Firefly::Url.shorten("http://example.com/")
       }.should change(Firefly::Url, :count).by(1)
     end
-    
+
     it "should return an existing Firefly::Url if the long_url exists" do
       Firefly::Url.shorten("http://example.com/")
       lambda {
         Firefly::Url.shorten("http://example.com/")
       }.should_not change(Firefly::Url, :count)
     end
-    
+
     it "should normalize urls correctly" do
       # Note the trailing '/'
       Firefly::Url.shorten("http://example.com/")
       lambda {
         Firefly::Url.shorten("http://example.com")
-      }.should_not change(Firefly::Url, :count)      
+      }.should_not change(Firefly::Url, :count)
     end
 
     it "should shortend urls containing spaces" do
       lambda {
         url = Firefly::Url.shorten("http://example.com/article with spaces.html")
@@ -53,12 +53,22 @@
 
     it "should escape urls with weird characters" do
       url = Firefly::Url.shorten("http://example.com/?a=\11\15")
       url.url.should eql("http://example.com/?a=%09%0D")
     end
+
+    it "should automatically forward code to prevent duplicates" do
+      url = Firefly::Url.shorten("http://example.com/")
+      the_code = url.code.next
+      Firefly::Url.create(:url => "http://example.com/blah", :code => the_code)
+
+      url_correct = Firefly::Url.shorten("http://example.com/testit")
+      url_correct.code.should_not eql(the_code)
+      url_correct.code.should eql(the_code.next)
+    end
   end
-  
+
   describe "long url validation" do
     [ "http://ariejan.net", 
       "https://ariejan.net",
       "http://ariejan.net/page/1",
       "http://ariejan.net/page/1?q=x&p=123",
@@ -66,31 +76,33 @@
     ].each do |url|
       it "should accept #{url}" do
         Firefly::Url.shorten(url).should_not be_nil
       end
     end
-    
+
     [ "ftp://ariejan.net", 
       "irc://freenode.org/rails",
       "skype:adevroom",
       "ariejan.net",
     ].each do |url|
       it "should not accept #{url}" do
-        Firefly::Url.shorten(url).should be_nil
+        lambda {
+          Firefly::Url.shorten(url).should be_nil
+        }.should raise_error(Firefly::InvalidUrlError)
       end
-    end    
+    end
   end
-  
+
   describe "clicking" do
     before(:each) do
       Firefly::Url.create(
         :url => 'http://example.com/123', 
         :code => 'alpha', 
         :clicks => 69
       )
       @url = Firefly::Url.first(:code => 'alpha')
     end
-    
+
     it "should increase the click count" do
       lambda {
         @url.register_click!
       }.should change(@url, :clicks).by(1)
     end