Specs for deploy_keys updated

miks
1 parent b8b6515f
Showing 5 changed files with 6 additions and 50 deletions Show diff stats
spec/factories.rb
spec/models/deploy_key_spec.rb
spec/models/key_spec.rb
spec/monkeypatch.rb
spec/requests/projects_deploy_keys_spec.rb
@@ -56,11 +56,6 @@ Factory.add(:key, Key) do |obj|
   obj.key = File.read(File.join(Rails.root, "db", "pkey.example"))
 end
-Factory.add(:deploy_key, DeployKey) do |obj|
-  obj.title = "Example key"
-  obj.key = File.read(File.join(Rails.root, "db", "pkey.example"))
-end
-
 Factory.add(:web_hook, WebHook) do |obj|
   obj.url = Faker::Internet.url
 end
@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe DeployKey do
-  describe "Associations" do
-    it { should belong_to(:project) }
-  end
-
-  describe "Validation" do
-    it { should validate_presence_of(:title) }
-    it { should validate_presence_of(:key) }
-  end
-
-  it { Factory.create(:deploy_key,
-                      :project => Factory(:project)).should be_valid }
-end
-# == Schema Information
-#
-# Table name: deploy_keys
-#
-#  id         :integer         not null, primary key
-#  project_id    :integer         not null
-#  created_at :datetime
-#  updated_at :datetime
-#  key        :text
-#  title      :string(255)
-#  identifier :string(255)
-#
-
-
@@ -2,7 +2,7 @@ require &#39;spec_helper&#39;
 describe Key do
   describe "Associations" do
-    it { should belong_to(:user) }
+    it { should belong_to(:user) or belong_to(:project)  }
   end
   describe "Validation" do
@@ -24,16 +24,6 @@ class Key
   end
 end
-class DeployKey
-  def update_repository
-    true
-  end
-
-  def repository_delete_key
-    true
-  end
-end
-
 class UsersProject
   def update_repository
     true
@@ -10,7 +10,7 @@ describe &quot;Projects&quot;, &quot;DeployKeys&quot; do
   describe "GET /keys" do
     before do
-      @key = Factory :deploy_key, :project => project
+      @key = Factory :key, :project => project
       visit project_deploy_keys_path(project)
     end
@@ -41,11 +41,11 @@ describe &quot;Projects&quot;, &quot;DeployKeys&quot; do
     describe "fill in" do
       before do
-        fill_in "deploy_key_title", :with => "laptop"
-        fill_in "deploy_key_key", :with => "publickey234="
+        fill_in "key_title", :with => "laptop"
+        fill_in "key_key", :with => "publickey234="
       end
-      it { expect { click_button "Save" }.to change {DeployKey.count}.by(1) }
+      it { expect { click_button "Save" }.to change {Key.count}.by(1) }
       it "should add new key to table" do
         click_button "Save"
@@ -58,7 +58,7 @@ describe &quot;Projects&quot;, &quot;DeployKeys&quot; do
   describe "Show page" do 
     before do
-      @key = Factory :deploy_key, :project => project
+      @key = Factory :key, :project => project
       visit project_deploy_key_path(project, @key) 
     end
	@@ -1,29 +0,0 @@	@@ -1,29 +0,0 @@
1	-require 'spec_helper'
2	-
3	-describe DeployKey do
4	- describe "Associations" do
5	- it { should belong_to(:project) }
6	- end
7	-
8	- describe "Validation" do
9	- it { should validate_presence_of(:title) }
10	- it { should validate_presence_of(:key) }
11	- end
12	-
13	- it { Factory.create(:deploy_key,
14	- :project => Factory(:project)).should be_valid }
15	-end
16	-# == Schema Information
17	-#
18	-# Table name: deploy_keys
19	-#
20	-# id :integer not null, primary key
21	-# project_id :integer not null
22	-# created_at :datetime
23	-# updated_at :datetime
24	-# key :text
25	-# title :string(255)
26	-# identifier :string(255)
27	-#
28	-
29	-
	@@ -2,7 +2,7 @@ require 'spec_helper'		@@ -2,7 +2,7 @@ require 'spec_helper'
2		2
3	describe Key do	3	describe Key do
4	describe "Associations" do	4	describe "Associations" do
5	- it { should belong_to(:user) }	5	+ it { should belong_to(:user) or belong_to(:project) }
6	end	6	end
7		7
8	describe "Validation" do	8	describe "Validation" do
	@@ -24,16 +24,6 @@ class Key		@@ -24,16 +24,6 @@ class Key
24	end	24	end
25	end	25	end
26		26
27	-class DeployKey
28	- def update_repository
29	- true
30	- end
31	-
32	- def repository_delete_key
33	- true
34	- end
35	-end
36	-
37	class UsersProject	27	class UsersProject
38	def update_repository	28	def update_repository
39	true	29	true