diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2018-10-05 15:52:17 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-10-05 15:52:17 +0300 |
| commit | ec85ec5e5836b90c493a5fec9269f602765a966c (patch) | |
| tree | 1d5b395d3ea7f78cfca8f7a90c65d9b814b0e8ee | |
| parent | 34573163612ff57e71843c65e4d5360c01e7cd24 (diff) | |
Stop cheatingjv-rspec-env-3
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | ruby/spec/integration_helper.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c2de1d9a0..963c4c378 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ danger-review: <<: *ruby_definition stage: build script: - - make rspec # <- cheating! + - make - _support/test-boot-time . .assemble_template: &assemble_definition diff --git a/ruby/spec/integration_helper.rb b/ruby/spec/integration_helper.rb index 84a504dc9..fc4f601c0 100644 --- a/ruby/spec/integration_helper.rb +++ b/ruby/spec/integration_helper.rb @@ -4,7 +4,7 @@ require 'gitaly' require 'spec_helper' SOCKET_PATH = 'gitaly.socket'.freeze -RUBY_DIR = File.expand_path('../..', __FILE__) +GITALY_RUBY_DIR = File.expand_path('../..', __FILE__) TMP_DIR = File.expand_path('../../tmp', __FILE__) module IntegrationClient @@ -32,7 +32,7 @@ def start_gitaly dir = "#{gitlab_shell_dir}" [gitaly-ruby] - dir = "#{RUBY_DIR}" + dir = "#{GITALY_RUBY_DIR}" [[storage]] name = "#{DEFAULT_STORAGE_NAME}" |