From bf5248ac28bf817344a8b1b4feda744a0832d32d Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 11 Apr 2017 21:25:10 +0100 Subject: Pull in fixture files from the repo --- spec/support/test_env.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'spec/support/test_env.rb') diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 1b5cb71a6b0..af1defb5a2e 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -38,7 +38,8 @@ module TestEnv 'deleted-image-test' => '6c17798', 'wip' => 'b9238ee', 'csv' => '3dd0896', - 'v1.1.0' => 'b83d6e3' + 'v1.1.0' => 'b83d6e3', + 'add-ipython-files' => '6d85bb69' }.freeze # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily -- cgit v1.2.3 From 476037b05b1a773bbe163ad01bc2046e38bf5a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= Date: Mon, 10 Apr 2017 18:33:41 -0300 Subject: Configure Gitaly through settings file instead of ENV vars --- spec/support/test_env.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'spec/support/test_env.rb') diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 60c2096a126..b974335a081 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -124,12 +124,13 @@ module TestEnv raise "Can't clone gitaly" end - start_gitaly(gitaly_dir, socket_path) + start_gitaly(gitaly_dir) end - def start_gitaly(gitaly_dir, socket_path) + def start_gitaly(gitaly_dir) gitaly_exec = File.join(gitaly_dir, 'gitaly') - @gitaly_pid = spawn({ "GITALY_SOCKET_PATH" => socket_path }, gitaly_exec, [:out, :err] => '/dev/null') + gitaly_config = File.join(gitaly_dir, 'config.toml') + @gitaly_pid = spawn(gitaly_exec, gitaly_config, [:out, :err] => '/dev/null') end def stop_gitaly -- cgit v1.2.3 From 9f3985c6133507ac721abbb4c19049656008ec68 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 11 Apr 2017 22:44:22 -0400 Subject: Move PDFLab into GitLab --- spec/support/test_env.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'spec/support/test_env.rb') diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 5c8ee8d62f5..0b3c6169c9b 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -39,7 +39,8 @@ module TestEnv 'wip' => 'b9238ee', 'csv' => '3dd0896', 'v1.1.0' => 'b83d6e3', - 'add-ipython-files' => '6d85bb69' + 'add-ipython-files' => '6d85bb69', + 'add-pdf-file' => 'e774ebd3' }.freeze # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily -- cgit v1.2.3