summaryrefslogtreecommitdiff
path: root/spec/support
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-04-01 18:35:29 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-04-01 18:35:29 +0300
commit3b88636d3c3a85d8dea83149b1f401d505d84d60 (patch)
treeb5cb0b83495e5b84f1eb54728a55bd258b64d4cb /spec/support
parentadccf3b49912df4ea630eb6e96e34204ddf932e6 (diff)
downloadgitlab-ce-3b88636d3c3a85d8dea83149b1f401d505d84d60.tar.gz
fix tests
Diffstat (limited to 'spec/support')
-rw-r--r--spec/support/test_env.rb6
1 files changed, 1 insertions, 5 deletions
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
)