Download as
Browse Code »

Commit 3b88636d3c3a85d8dea83149b1f401d505d84d60

Authored by Dmitriy Zaporozhets
1 parent adccf3b4
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

fix tests

Showing 3 changed files with 5 additions and 8 deletions   Show diff stats
spec/features/profile_spec.rb
  Diff comments   View file @3b88636
... ... @@ -12,8 +12,9 @@ describe "Profile account page" do
12 12 Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
13 13 visit account_profile_path
14 14 end
  15 +
15 16 it { page.should have_content("Remove account") }
16   -
  17 +
17 18 it "should delete the account", js: true do
18 19 expect { click_link "Delete account" }.to change {User.count}.by(-1)
19 20 current_path.should == new_user_session_path
... ... @@ -45,4 +46,4 @@ describe "Profile account page" do
45 46 current_path.should == account_profile_path
46 47 end
47 48 end
48   -end
49 49 \ No newline at end of file
  50 +end
... ...
spec/features/security/project_access_spec.rb
  Diff comments   View file @3b88636
... ... @@ -14,7 +14,7 @@ describe "Application access" do
14 14 end
15 15  
16 16 describe "Project" do
17   - let(:project) { create(:project) }
  17 + let(:project) { create(:project_with_code) }
18 18  
19 19 let(:master) { create(:user) }
20 20 let(:guest) { create(:user) }
... ...
spec/support/test_env.rb
  Diff comments   View file @3b88636
... ... @@ -29,16 +29,12 @@ module TestEnv
29 29 remove_key: true
30 30 )
31 31  
32   - fake_satellite = stub(
  32 + Gitlab::Satellite::Satellite.any_instance.stub(
33 33 exists?: true,
34 34 destroy: true,
35 35 create: true
36 36 )
37 37  
38   - Project.any_instance.stub(
39   - satellite: fake_satellite
40   - )
41   -
42 38 MergeRequest.any_instance.stub(
43 39 check_if_can_be_merged: true
44 40 )
... ...