diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-11-21 14:56:27 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-11-21 14:56:27 +0100 |
| commit | fc74f3e68b5a2d3ba3b81e9bbc6d8dc8270dfddc (patch) | |
| tree | c1510703ee52b5e09ad5160f4959b21194c168d2 | |
| parent | 4702b923f6496a1b6afcbde4b1bdf204b249d0c4 (diff) | |
| download | gitlab-ce-fc74f3e68b5a2d3ba3b81e9bbc6d8dc8270dfddc.tar.gz | |
fix tests, use gitaly master until released
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 2 | ||||
| -rw-r--r-- | spec/requests/api/v3/merge_requests_spec.rb | 2 | ||||
| -rw-r--r-- | spec/tasks/gitlab/gitaly_rake_spec.rb | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index c7d66bafe1d..577cd59bc01 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -=gitaly-ruby-wd +=master diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index a928ba79a4d..35c6b3bb2fb 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -628,7 +628,7 @@ describe API::MergeRequests do context 'forked projects' do let!(:user2) { create(:user) } - let!(:forked_project) { fork_project(project, user2) } + let!(:forked_project) { fork_project(project, user2, repository: true) } let!(:unrelated_project) { create(:project, namespace: create(:user).namespace, creator_id: user2.id) } before do diff --git a/spec/requests/api/v3/merge_requests_spec.rb b/spec/requests/api/v3/merge_requests_spec.rb index 91897e5ee01..2e2b9449429 100644 --- a/spec/requests/api/v3/merge_requests_spec.rb +++ b/spec/requests/api/v3/merge_requests_spec.rb @@ -314,7 +314,7 @@ describe API::MergeRequests do context 'forked projects' do let!(:user2) { create(:user) } - let!(:forked_project) { fork_project(project, user2) } + let!(:forked_project) { fork_project(project, user2, repository: true) } let!(:unrelated_project) { create(:project, namespace: create(:user).namespace, creator_id: user2.id) } before do diff --git a/spec/tasks/gitlab/gitaly_rake_spec.rb b/spec/tasks/gitlab/gitaly_rake_spec.rb index 255f0a37ec8..2220b8339f4 100644 --- a/spec/tasks/gitlab/gitaly_rake_spec.rb +++ b/spec/tasks/gitlab/gitaly_rake_spec.rb @@ -110,6 +110,7 @@ describe 'gitlab:gitaly namespace rake task' do expected_output = <<~TOML # Gitaly storage configuration generated from #{Gitlab.config.source} on #{Time.current.to_s(:long)} # This is in TOML format suitable for use in Gitaly's config.toml file. + bin_dir = "tmp/tests/gitaly" socket_path = "/path/to/my.socket" [gitlab-shell] dir = "#{Gitlab.config.gitlab_shell.path}" |