Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-11-05 17:35:49 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-11-05 17:35:49 +0400
commitf9b66aecddb248dcd501419e0ee94fd69fab4de3 (patch)
treed924e72bbaa4b6dd2fbea631620a22dd5253df8f /spec
parentad41430c29514d14e79722c8813df246949fd798 (diff)
Revert "More escaping"
This reverts commit c46eaca91247ccf8e6fb3b691dad028e1b084ae3.
Diffstat (limited to 'spec')
-rw-r--r--spec/models/gollum_wiki_spec.rb4
-rw-r--r--spec/models/wiki_page_spec.rb4
-rw-r--r--spec/support/test_env.rb8
3 files changed, 8 insertions, 8 deletions
diff --git a/spec/models/gollum_wiki_spec.rb b/spec/models/gollum_wiki_spec.rb
index de786478de9..9e07d9ee191 100644
--- a/spec/models/gollum_wiki_spec.rb
+++ b/spec/models/gollum_wiki_spec.rb
@@ -1,11 +1,11 @@
require "spec_helper"
-require "shellwords"
describe GollumWiki do
def create_temp_repo(path)
FileUtils.mkdir_p path
- system("git init --quiet #{Shellwords.shellescape(path)}")
+ command = "git init --quiet #{path};"
+ system(command)
end
def remove_temp_repo(path)
diff --git a/spec/models/wiki_page_spec.rb b/spec/models/wiki_page_spec.rb
index b9883342c3a..67f2a6da42d 100644
--- a/spec/models/wiki_page_spec.rb
+++ b/spec/models/wiki_page_spec.rb
@@ -1,11 +1,11 @@
require "spec_helper"
-require "shellwords"
describe WikiPage do
def create_temp_repo(path)
FileUtils.mkdir_p path
- system("git init --quiet #{Shellwords.shellescape(path)}")
+ command = "git init --quiet #{path};"
+ system(command)
end
def remove_temp_repo(path)
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 5c6f96abc1b..16e10b1a62b 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -1,5 +1,4 @@
require 'rspec/mocks'
-require 'shellwords'
module TestEnv
extend self
@@ -103,7 +102,7 @@ module TestEnv
repo = repo(namespace, name)
# Symlink tmp/repositories/gitlabhq to tmp/test-git-base-path/gitlabhq
- system("ln -s -f #{Shellwords.shellescape(seed_repo_path())} #{Shellwords.shellescape(repo)}")
+ system("ln -s -f #{seed_repo_path()} #{repo}")
create_satellite(repo, namespace, name)
end
@@ -167,11 +166,12 @@ module TestEnv
# Symlink tmp/satellite/gitlabhq to tmp/test-git-base-path/satellite/gitlabhq, create the directory if it doesn't exist already
satellite_dir = File.dirname(satellite_repo)
FileUtils.mkdir_p(satellite_dir) unless File.exists?(satellite_dir)
- system("ln -s -f #{Shellwords.shellescape(seed_satellite_path)} #{Shellwords.shellescape(satellite_repo)}")
+ system("ln -s -f #{seed_satellite_path} #{satellite_repo}")
end
def create_temp_repo(path)
FileUtils.mkdir_p path
- system("git init --quiet --bare #{Shellwords.shellescape(path)}")
+ command = "git init --quiet --bare #{path};"
+ system(command)
end
end