salt should not really containt special characters

1 files changed, 21 insertions, 12 deletions

diff --git a/spec/trocla/util_spec.rb b/spec/trocla/util_spec.rb
index 4e02d97..879b244 100644
--- a/spec/trocla/util_spec.rb
+++ b/spec/trocla/util_spec.rb
@@ -1,19 +1,28 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Trocla::Util" do
-  describe "random_str" do
-    it "should be random" do
-      Trocla::Util.random_str.should_not eql(Trocla::Util.random_str)
-    end
+
+  { :random_str => 12, :salt => 8 }.each do |m,length|
+    describe m do
+      it "should be random" do
+        Trocla::Util.send(m).should_not eql(Trocla::Util.send(m))
+      end
     
-    it "should default to length 12" do
-      Trocla::Util.random_str.length.should == 12
-    end
+      it "should default to length #{length}" do
+        Trocla::Util.send(m).length.should == length
+      end
     
-    it "should be possible to change length" do
-      Trocla::Util.random_str(8).length.should == 8
-      Trocla::Util.random_str(32).length.should == 32
-      Trocla::Util.random_str(1).length.should == 1
+      it "should be possible to change length" do
+        Trocla::Util.send(m,8).length.should == 8
+        Trocla::Util.send(m,32).length.should == 32
+        Trocla::Util.send(m,1).length.should == 1
+      end
+    end
+  end
+
+  describe :salt do
+    it "should only contain characters and numbers" do
+      Trocla::Util.salt =~ /^[a-z0-9]+$/i
     end
   end
-end
\ No newline at end of file
+end