Merge branch 'deploy_keys_nonunique' of https://github.com/miks/gitlabhq into miks-deploy_keys_nonunique

Added/fixed specs
Update spec/factory to allow Factory#new without opts

Conflicts:
	app/models/key.rb

spec/models/key_spec.rb

@@ -14,8 +14,40 @@ describe Key do
     it { should respond_to :projects }
   end
 
-  it { Factory.create(:key,
-                      :user => Factory(:user)).should be_valid }
+  context "validation of uniqueness" do
+
+    context "as a deploy key" do
+      let(:project) { Factory.create(:project, path: 'alpha', code: 'alpha') }
+      let(:another_project) { Factory.create(:project, path: 'beta', code: 'beta') }
+
+      before do
+        deploy_key = Factory.create(:key, project: project)
+      end
+
+      it "does not accept the same key twice for a project" do
+        key = Factory.new(:key, project: project)
+        key.should_not be_valid
+      end
+
+      it "does accept the same key for another project" do
+        key = Factory.new(:key, project: another_project)
+        key.should be_valid
+      end
+    end
+
+    context "as a personal key" do
+      let(:user) { Factory.create(:user) }
+
+      it "accepts the key once" do
+        Factory.new(:key, user: user).should be_valid
+      end
+
+      it "does not accepts the key twice" do
+        Factory.create(:key, user: user)
+        Factory.new(:key, user: user).should_not be_valid
+      end
+    end
+  end
 end
 # == Schema Information
 #