diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-07-07 21:37:04 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-07-07 21:37:04 +0300 |
| commit | 426271dacbb3b7462e4f7a78fa3628bbd267609a (patch) | |
| tree | 930dabccfd90cfad90e7aa86dd557bc309c075c9 /spec | |
| parent | 787a23475a6de02438608d2af8d21577afbbd447 (diff) | |
| parent | c81928cfa757b6f42debd6d1c3b6cdb860fc14f5 (diff) | |
Merge branch 'dm-fix-project-path-helpers-production' into 'master'
Include new URL helpers retroactively into includers of Gitlab::Routing
Closes #34821
See merge request !12716
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/extracts_path_spec.rb | 2 | ||||
| -rw-r--r-- | spec/models/project_services/jira_service_spec.rb | 2 | ||||
| -rw-r--r-- | spec/services/system_note_service_spec.rb | 2 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/spec/lib/extracts_path_spec.rb b/spec/lib/extracts_path_spec.rb index f2132d485ab..dfffef8b9b7 100644 --- a/spec/lib/extracts_path_spec.rb +++ b/spec/lib/extracts_path_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe ExtractsPath, lib: true do include ExtractsPath include RepoHelpers - include Gitlab::Routing.url_helpers + include Gitlab::Routing let(:project) { double('project') } let(:request) { double('request') } diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb index 4a1de76f099..105afed1337 100644 --- a/spec/models/project_services/jira_service_spec.rb +++ b/spec/models/project_services/jira_service_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe JiraService, models: true do - include Gitlab::Routing.url_helpers + include Gitlab::Routing describe "Associations" do it { is_expected.to belong_to :project } diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb index e35e4c1d631..60477b8e9ba 100644 --- a/spec/services/system_note_service_spec.rb +++ b/spec/services/system_note_service_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe SystemNoteService, services: true do - include Gitlab::Routing.url_helpers + include Gitlab::Routing let(:project) { create(:empty_project) } let(:author) { create(:user) } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 3e90a642d56..a497b8613bb 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -57,7 +57,7 @@ RSpec.configure do |config| config.include StubGitlabCalls config.include StubGitlabData config.include ApiHelpers, :api - config.include Gitlab::Routing.url_helpers, type: :routing + config.include Gitlab::Routing, type: :routing config.include MigrationsHelpers, :migration config.infer_spec_type_from_file_location! |