Commit 3b88636d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

fix tests

parent adccf3b4
...@@ -12,6 +12,7 @@ describe "Profile account page" do ...@@ -12,6 +12,7 @@ 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
......
...@@ -14,7 +14,7 @@ describe "Application access" do ...@@ -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) }
......
...@@ -29,16 +29,12 @@ module TestEnv ...@@ -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
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment