diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-06-25 15:51:48 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-25 15:51:48 +0000 |
commit | 8d10afb5ca4f1f8b68c3ba8a4d5db9ddc37d658f (patch) | |
tree | e6e3fe6b727aa91947a2542e6d420bbbac977dcc /spec | |
parent | d73b6d0f455c4b77dbea7e8b5d5a1574fd665fe0 (diff) | |
parent | 9e93ea8e64d8aca7f3b2b7fe7a0c7f8a9bd97be5 (diff) | |
download | gitlab-ce-8d10afb5ca4f1f8b68c3ba8a4d5db9ddc37d658f.tar.gz |
Merge branch '63177-follow-up-from-use-scoped-routes-for-labels-and-milestones' into 'master'
Resolve "Follow-up from "Use scoped routes for labels and milestones""
Closes #63177
See merge request gitlab-org/gitlab-ce!29983
Diffstat (limited to 'spec')
-rw-r--r-- | spec/helpers/search_helper_spec.rb | 6 | ||||
-rw-r--r-- | spec/javascripts/filtered_search/visual_token_value_spec.js | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/helpers/search_helper_spec.rb b/spec/helpers/search_helper_spec.rb index da14f7f16fb..c69493b579f 100644 --- a/spec/helpers/search_helper_spec.rb +++ b/spec/helpers/search_helper_spec.rb @@ -114,7 +114,7 @@ describe SearchHelper do end it 'includes project endpoints' do - expect(search_filter_input_options('')[:data]['base-endpoint']).to eq(project_path(@project)) + expect(search_filter_input_options('')[:data]['runner-tags-endpoint']).to eq(tag_list_admin_runners_path) expect(search_filter_input_options('')[:data]['labels-endpoint']).to eq(project_labels_path(@project)) expect(search_filter_input_options('')[:data]['milestones-endpoint']).to eq(project_milestones_path(@project)) end @@ -134,7 +134,7 @@ describe SearchHelper do end it 'includes group endpoints' do - expect(search_filter_input_options('')[:data]['base-endpoint']).to eq("/groups#{group_path(@group)}") + expect(search_filter_input_options('')[:data]['runner-tags-endpoint']).to eq(tag_list_admin_runners_path) expect(search_filter_input_options('')[:data]['labels-endpoint']).to eq(group_labels_path(@group)) expect(search_filter_input_options('')[:data]['milestones-endpoint']).to eq(group_milestones_path(@group)) end @@ -147,7 +147,7 @@ describe SearchHelper do end it 'includes dashboard endpoints' do - expect(search_filter_input_options('')[:data]['base-endpoint']).to eq("/dashboard") + expect(search_filter_input_options('')[:data]['runner-tags-endpoint']).to eq(tag_list_admin_runners_path) expect(search_filter_input_options('')[:data]['labels-endpoint']).to eq(dashboard_labels_path) expect(search_filter_input_options('')[:data]['milestones-endpoint']).to eq(dashboard_milestones_path) end diff --git a/spec/javascripts/filtered_search/visual_token_value_spec.js b/spec/javascripts/filtered_search/visual_token_value_spec.js index d1d16afc977..10d844fd94b 100644 --- a/spec/javascripts/filtered_search/visual_token_value_spec.js +++ b/spec/javascripts/filtered_search/visual_token_value_spec.js @@ -155,7 +155,7 @@ describe('Filtered Search Visual Tokens', () => { `); const filteredSearchInput = document.querySelector('.filtered-search'); - filteredSearchInput.dataset.baseEndpoint = dummyEndpoint; + filteredSearchInput.dataset.runnerTagsEndpoint = `${dummyEndpoint}/admin/runners/tag_list`; filteredSearchInput.dataset.labelsEndpoint = `${dummyEndpoint}/-/labels`; filteredSearchInput.dataset.milestonesEndpoint = `${dummyEndpoint}/-/milestones`; |