deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix test i broke with ssk key validation. Added Key.user_id as attr_protected

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-08-29 07:58:22 +03:00
parent 5afb16e496
commit adc71b6a6a
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/key.rb
View file

@ -4,13 +4,15 @@ class Key < ActiveRecord::Base
belongs_to :user belongs_to :user
belongs_to :project belongs_to :project
attr_protected :user_id
validates :title, validates :title,
presence: true, presence: true,
length: { within: 0..255 } length: { within: 0..255 }
validates :key, validates :key,
presence: true, presence: true,
:format => { :with => /ssh-.{3} / }, format: { :with => /ssh-.{3} / },
length: { within: 0..5000 } length: { within: 0..5000 }
before_save :set_identifier before_save :set_identifier

4
features/profile/ssh_keys.feature
View file

@ -3,8 +3,8 @@ Feature: SSH Keys
Given I signin as a user Given I signin as a user
And I have ssh keys: And I have ssh keys:
| title | | title |
| Work | | ssh-rsa Work |
| Home | | ssh-rsa Home |
And I visit profile keys page And I visit profile keys page
Scenario: I should see SSH keys Scenario: I should see SSH keys

2
features/step_definitions/profile/profile_keys_steps.rb
View file

@ -16,7 +16,7 @@ end
Given /^I submit new ssh key "(.*?)"$/ do |arg1| Given /^I submit new ssh key "(.*?)"$/ do |arg1|
fill_in "key_title", :with => arg1 fill_in "key_title", :with => arg1
fill_in "key_key", :with => "publickey234=" fill_in "key_key", :with => "ssh-rsa publickey234="
click_button "Save" click_button "Save"
end end

8
spec/requests/projects_deploy_keys_spec.rb
View file

@ -42,7 +42,7 @@ describe "Projects", "DeployKeys" do
describe "fill in" do describe "fill in" do
before do before do
fill_in "key_title", with: "laptop" fill_in "key_title", with: "laptop"
fill_in "key_key", with: "publickey234=" fill_in "key_key", with: "ssh-rsa publickey234="
end end
it { expect { click_button "Save" }.to change {Key.count}.by(1) } it { expect { click_button "Save" }.to change {Key.count}.by(1) }
@ -55,12 +55,12 @@ describe "Projects", "DeployKeys" do
end end
end end
describe "Show page" do describe "Show page" do
before do before do
@key = Factory :key, project: project @key = Factory :key, project: project
visit project_deploy_key_path(project, @key) visit project_deploy_key_path(project, @key)
end end
it { page.should have_content @key.title } it { page.should have_content @key.title }
it { page.should have_content @key.key[0..10] } it { page.should have_content @key.key[0..10] }
end end