diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-04-01 18:35:29 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-04-01 18:35:29 +0300 |
commit | 3b88636d3c3a85d8dea83149b1f401d505d84d60 (patch) | |
tree | b5cb0b83495e5b84f1eb54728a55bd258b64d4cb | |
parent | adccf3b49912df4ea630eb6e96e34204ddf932e6 (diff) | |
download | gitlab-ce-3b88636d3c3a85d8dea83149b1f401d505d84d60.tar.gz |
fix tests
-rw-r--r-- | spec/features/profile_spec.rb | 5 | ||||
-rw-r--r-- | spec/features/security/project_access_spec.rb | 2 | ||||
-rw-r--r-- | spec/support/test_env.rb | 6 |
3 files changed, 5 insertions, 8 deletions
diff --git a/spec/features/profile_spec.rb b/spec/features/profile_spec.rb index c18d8f921a3..51b95c2595d 100644 --- a/spec/features/profile_spec.rb +++ b/spec/features/profile_spec.rb @@ -12,8 +12,9 @@ describe "Profile account page" do Gitlab.config.gitlab.stub(:signup_enabled).and_return(true) visit account_profile_path end + it { page.should have_content("Remove account") } - + it "should delete the account", js: true do expect { click_link "Delete account" }.to change {User.count}.by(-1) current_path.should == new_user_session_path @@ -45,4 +46,4 @@ describe "Profile account page" do current_path.should == account_profile_path end end -end
\ No newline at end of file +end diff --git a/spec/features/security/project_access_spec.rb b/spec/features/security/project_access_spec.rb index 179ebffc2ad..cfbb8f135ab 100644 --- a/spec/features/security/project_access_spec.rb +++ b/spec/features/security/project_access_spec.rb @@ -14,7 +14,7 @@ describe "Application access" do end describe "Project" do - let(:project) { create(:project) } + let(:project) { create(:project_with_code) } let(:master) { create(:user) } let(:guest) { create(:user) } diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 19be8029a98..370094d3765 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -29,16 +29,12 @@ module TestEnv remove_key: true ) - fake_satellite = stub( + Gitlab::Satellite::Satellite.any_instance.stub( exists?: true, destroy: true, create: true ) - Project.any_instance.stub( - satellite: fake_satellite - ) - MergeRequest.any_instance.stub( check_if_can_be_merged: true ) |