Commit f2b37de5 authored by Douwe Maan's avatar Douwe Maan

Fix specs.

parent 448817c4
path = File.expand_path("~/.ssh/id_rsa.pub") path = File.expand_path("~/.ssh/id_rsa.pub")
Gitlab::BitbucketImport.public_key = File.read(path) if File.exist?(path) Gitlab::BitbucketImport.public_key = File.read(path) if File.exist?(path)
\ No newline at end of file
...@@ -3,4 +3,4 @@ module Gitlab ...@@ -3,4 +3,4 @@ module Gitlab
mattr_accessor :public_key mattr_accessor :public_key
@public_key = nil @public_key = nil
end end
end end
\ No newline at end of file
...@@ -5,6 +5,7 @@ describe Import::BitbucketController do ...@@ -5,6 +5,7 @@ describe Import::BitbucketController do
before do before do
sign_in(user) sign_in(user)
controller.stub(:bitbucket_import_enabled?).and_return(true)
end end
describe "GET callback" do describe "GET callback" do
......
...@@ -5,6 +5,7 @@ describe Import::GithubController do ...@@ -5,6 +5,7 @@ describe Import::GithubController do
before do before do
sign_in(user) sign_in(user)
controller.stub(:github_import_enabled?).and_return(true)
end end
describe "GET callback" do describe "GET callback" do
......
...@@ -5,6 +5,7 @@ describe Import::GitlabController do ...@@ -5,6 +5,7 @@ describe Import::GitlabController do
before do before do
sign_in(user) sign_in(user)
controller.stub(:gitlab_import_enabled?).and_return(true)
end end
describe "GET callback" do describe "GET callback" do
......
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