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

fix tests

master
Dmitriy Zaporozhets 2013-04-01 18:35:29 +03:00
parent adccf3b499
commit 3b88636d3c
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spec/features/profile_spec.rb
View File

@ -12,8 +12,9 @@ describe "Profile account page" do
Gitlab.config.gitlab.stub(:signup_enabled).and_return(true) Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
visit account_profile_path visit account_profile_path
end end
it { page.should have_content("Remove account") } it { page.should have_content("Remove account") }
it "should delete the account", js: true do it "should delete the account", js: true do
expect { click_link "Delete account" }.to change {User.count}.by(-1) expect { click_link "Delete account" }.to change {User.count}.by(-1)
current_path.should == new_user_session_path current_path.should == new_user_session_path
@ -45,4 +46,4 @@ describe "Profile account page" do
current_path.should == account_profile_path current_path.should == account_profile_path
end end
end end
end end

2
spec/features/security/project_access_spec.rb
View File

@ -14,7 +14,7 @@ describe "Application access" do
end end
describe "Project" do describe "Project" do
let(:project) { create(:project) } let(:project) { create(:project_with_code) }
let(:master) { create(:user) } let(:master) { create(:user) }
let(:guest) { create(:user) } let(:guest) { create(:user) }

6
spec/support/test_env.rb
View File

@ -29,16 +29,12 @@ module TestEnv
remove_key: true remove_key: true
) )
fake_satellite = stub( Gitlab::Satellite::Satellite.any_instance.stub(
exists?: true, exists?: true,
destroy: true, destroy: true,
create: true create: true
) )
Project.any_instance.stub(
satellite: fake_satellite
)
MergeRequest.any_instance.stub( MergeRequest.any_instance.stub(
check_if_can_be_merged: true check_if_can_be_merged: true
) )