diff --git a/.gitlab/ci/qa-common/variables.gitlab-ci.yml b/.gitlab/ci/qa-common/variables.gitlab-ci.yml
index b5a74e30fe2..dd93eb4f180 100644
--- a/.gitlab/ci/qa-common/variables.gitlab-ci.yml
+++ b/.gitlab/ci/qa-common/variables.gitlab-ci.yml
@@ -16,4 +16,4 @@ variables:
QA_OMNIBUS_MR_TESTS: "only-smoke"
# Retry failed specs in separate process
QA_RETRY_FAILED_SPECS: "true"
- GITLAB_HELM_CHART_REF: "ec4eb83b98572fd2721516df00799858512b0538" # helm chart ref used by test-on-cng pipeline
+ GITLAB_HELM_CHART_REF: "8590da829037a326808e425488919d374ed36cd2" # helm chart ref used by test-on-cng pipeline
diff --git a/app/assets/javascripts/admin/abuse_reports/components/abuse_report_row.vue b/app/assets/javascripts/admin/abuse_reports/components/abuse_report_row.vue
index 74f4fb53a09..42800eb3e1a 100644
--- a/app/assets/javascripts/admin/abuse_reports/components/abuse_report_row.vue
+++ b/app/assets/javascripts/admin/abuse_reports/components/abuse_report_row.vue
@@ -67,7 +67,7 @@ export default {
{{ title }}
@@ -86,7 +86,7 @@ export default {
- {{ displayDate }}
+ {{ displayDate }}
diff --git a/app/assets/javascripts/content_editor/services/table_of_contents_utils.js b/app/assets/javascripts/content_editor/services/table_of_contents_utils.js
index 49737610635..455f053f528 100644
--- a/app/assets/javascripts/content_editor/services/table_of_contents_utils.js
+++ b/app/assets/javascripts/content_editor/services/table_of_contents_utils.js
@@ -2,16 +2,17 @@ class TOCHeading {
parent = null;
subHeadings = [];
- constructor(text) {
+ constructor(text, href) {
this.text = text;
+ this.href = href;
}
get level() {
return this.parent ? this.parent.level + 1 : 0;
}
- addSubHeading(text) {
- const heading = new TOCHeading(text);
+ addSubHeading(text, href) {
+ const heading = new TOCHeading(text, href);
heading.parent = this;
this.subHeadings.push(heading);
return heading;
@@ -46,6 +47,7 @@ class TOCHeading {
toJSON() {
return {
text: this.text,
+ href: this.href,
level: this.level,
subHeadings: this.subHeadings.map((subHeading) => subHeading.toJSON()),
};
@@ -76,7 +78,7 @@ export function toTree(headings) {
if (heading.level <= currentHeading.level) {
currentHeading = currentHeading.parentAt(heading.level - 1);
}
- currentHeading = (currentHeading || tree).addSubHeading(heading.text);
+ currentHeading = (currentHeading || tree).addSubHeading(heading.text, heading.href);
}
return tree.flattenIfEmpty().toJSON();
@@ -98,3 +100,15 @@ export function getHeadings(editor) {
return toTree(headings).subHeadings;
}
+
+export function getHeadingsFromDOM(containerElement) {
+ const headingSelectors = 'h1, h2, h3, h4, h5, h6';
+
+ return toTree(
+ [...containerElement.querySelectorAll(headingSelectors)].map((heading) => ({
+ level: parseInt(heading.tagName[1], 10),
+ text: heading.textContent.trim(),
+ href: heading.querySelector('a').getAttribute('href'),
+ })),
+ ).subHeadings;
+}
diff --git a/app/assets/javascripts/pages/shared/wikis/components/table_of_contents.vue b/app/assets/javascripts/pages/shared/wikis/components/table_of_contents.vue
new file mode 100644
index 00000000000..7b3d7608b7a
--- /dev/null
+++ b/app/assets/javascripts/pages/shared/wikis/components/table_of_contents.vue
@@ -0,0 +1,30 @@
+
+
+
+
{{ __('On this page') }}
+
+
Expand
-
```shell
curl "http://localhost:9200/gitlab-development-issues/_count" \
--header "Content-Type: application/json" \
--data '{"query": {"bool": {"filter": [{"term": {"project_id": PROJECT_ID}}], "must_not": [{"exists": {"field": "embedding"}}]}}}' | jq '.count'
```
-Heading 1
+ Heading 1.1
+ Heading 1.1.1
+ Heading 1.2
+ Heading 1.2.1
+ Heading 1.3
+ Heading 1.4
+ Heading 1.4.1
+ Heading 2
+ `;
+
+ expect(getHeadingsFromDOM(element)).toEqual([
+ {
+ href: '#heading-1',
+ level: 1,
+ subHeadings: [
+ {
+ href: '#heading-1-1',
+ level: 2,
+ subHeadings: [
+ { href: '#heading-1-1-1', level: 3, subHeadings: [], text: 'Heading 1.1.1' },
+ ],
+ text: 'Heading 1.1',
+ },
+ {
+ href: '#heading-1-2',
+ level: 2,
+ subHeadings: [
+ { href: '#heading-1-2-1', level: 3, subHeadings: [], text: 'Heading 1.2.1' },
+ ],
+ text: 'Heading 1.2',
+ },
+ { href: '#heading-1-3', level: 2, subHeadings: [], text: 'Heading 1.3' },
+ {
+ href: '#heading-1-4',
+ level: 2,
+ subHeadings: [
+ { href: '#heading-1-4-1', level: 3, subHeadings: [], text: 'Heading 1.4.1' },
+ ],
+ text: 'Heading 1.4',
+ },
+ ],
+ text: 'Heading 1',
+ },
+ { href: '#heading-2', level: 1, subHeadings: [], text: 'Heading 2' },
+ ]);
+ });
+ });
});
diff --git a/spec/frontend/notes/stores/mutation_spec.js b/spec/frontend/notes/stores/mutation_spec.js
index a588957dd0e..b3f2804a4a0 100644
--- a/spec/frontend/notes/stores/mutation_spec.js
+++ b/spec/frontend/notes/stores/mutation_spec.js
@@ -1,4 +1,3 @@
-import Vue from 'vue';
import { DISCUSSION_NOTE, ASC, DESC } from '~/notes/constants';
import mutations from '~/notes/stores/mutations';
import {
@@ -598,13 +597,15 @@ describe('Notes Store mutations', () => {
});
it('keeps reactivity of discussion', () => {
- const state = {};
- Vue.set(state, 'discussions', [
- {
- id: 1,
- expanded: false,
- },
- ]);
+ const state = {
+ discussions: [
+ {
+ id: 1,
+ expanded: false,
+ },
+ ],
+ };
+
const discussion = state.discussions[0];
mutations.SET_DISCUSSION_DIFF_LINES(state, {
diff --git a/spec/frontend/pages/shared/wikis/components/wiki_content_spec.js b/spec/frontend/pages/shared/wikis/components/wiki_content_spec.js
index 92fb7a7e00f..629105473cd 100644
--- a/spec/frontend/pages/shared/wikis/components/wiki_content_spec.js
+++ b/spec/frontend/pages/shared/wikis/components/wiki_content_spec.js
@@ -74,7 +74,7 @@ describe('pages/shared/wikis/components/wiki_content', () => {
it('calls renderGFM after nextTick', async () => {
await nextTick();
- expect(renderGFM).toHaveBeenCalledWith(wrapper.element);
+ expect(renderGFM).toHaveBeenCalled();
});
it('handles hash after render', async () => {
diff --git a/spec/frontend/work_items/components/work_item_links/work_item_tree_children_spec.js b/spec/frontend/work_items/components/work_item_links/work_item_tree_children_spec.js
new file mode 100644
index 00000000000..d4b546fd594
--- /dev/null
+++ b/spec/frontend/work_items/components/work_item_links/work_item_tree_children_spec.js
@@ -0,0 +1,49 @@
+import { shallowMount } from '@vue/test-utils';
+import WorkItemTreeChildren from '~/work_items/components/work_item_links/work_item_tree_children.vue';
+import WorkItemLinkChild from '~/work_items/components/work_item_links/work_item_link_child.vue';
+import { childrenWorkItems } from '../../mock_data';
+
+describe('WorkItemTreeChildren', () => {
+ let wrapper;
+
+ const createComponent = ({ children = childrenWorkItems } = {}) => {
+ wrapper = shallowMount(WorkItemTreeChildren, {
+ propsData: {
+ workItemType: 'Objective',
+ workItemId: 'gid:://gitlab/WorkItem/1',
+ children,
+ canUpdate: true,
+ showLabels: true,
+ },
+ });
+ };
+
+ const findWorkItemLinkChildItems = () => wrapper.findAllComponents(WorkItemLinkChild);
+ const findWorkItemLinkChildItem = () => findWorkItemLinkChildItems().at(0);
+
+ beforeEach(() => {
+ createComponent();
+ });
+
+ it('renders all WorkItemLinkChildItems', () => {
+ expect(findWorkItemLinkChildItems().length).toBe(4);
+ });
+
+ it('emits childItem from WorkItemLinkChildItems on `click` event', () => {
+ const event = {
+ childItem: 'gid://gitlab/WorkItem/2',
+ };
+
+ findWorkItemLinkChildItem().vm.$emit('click', event);
+
+ expect(wrapper.emitted('click')).toEqual([[{ childItem: 'gid://gitlab/WorkItem/2' }]]);
+ });
+
+ it('emits immediate childItem on `click` event', () => {
+ const event = expect.anything();
+
+ findWorkItemLinkChildItem().vm.$emit('click', event);
+
+ expect(wrapper.emitted('click')).toEqual([[{ childItem: 'gid://gitlab/WorkItem/2' }]]);
+ });
+});
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index f9b22e53234..4326de27dc3 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -645,6 +645,7 @@ project:
- notes
- snippets
- hooks
+- all_protected_branches
- protected_branches
- protected_tags
- project_members
diff --git a/spec/lib/gitlab/pagination/gitaly_keyset_pager_spec.rb b/spec/lib/gitlab/pagination/gitaly_keyset_pager_spec.rb
index 914c1e7bb74..5dd340f69fd 100644
--- a/spec/lib/gitlab/pagination/gitaly_keyset_pager_spec.rb
+++ b/spec/lib/gitlab/pagination/gitaly_keyset_pager_spec.rb
@@ -129,6 +129,18 @@ RSpec.describe Gitlab::Pagination::GitalyKeysetPager, feature_category: :source_
pager.paginate(finder)
end
end
+
+ context 'when the current page includes all requested elements and cursor is empty' do
+ let(:base_query) { { per_page: 2 } }
+ let(:branches) { [branch1, branch2] }
+ let(:next_cursor) { '' }
+
+ it 'uses keyset pagination without link headers' do
+ expect(request_context).not_to receive(:header).with('Link', anything)
+
+ pager.paginate(finder)
+ end
+ end
end
end
diff --git a/spec/lib/sidebars/admin/menus/abuse_reports_menu_spec.rb b/spec/lib/sidebars/admin/menus/abuse_reports_menu_spec.rb
index ef5b8055bec..dc75f9e0e1f 100644
--- a/spec/lib/sidebars/admin/menus/abuse_reports_menu_spec.rb
+++ b/spec/lib/sidebars/admin/menus/abuse_reports_menu_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
RSpec.describe Sidebars::Admin::Menus::AbuseReportsMenu, feature_category: :navigation do
it_behaves_like 'Admin menu',
link: '/admin/abuse_reports',
- title: _('Abuse Reports'),
+ title: _('Abuse reports'),
icon: 'slight-frown'
it_behaves_like 'Admin menu without sub menus', active_routes: { controller: :abuse_reports }
diff --git a/spec/migrations/db/post_migrate/20240701182755_finalize_backfill_epic_issues_into_work_item_parent_links_spec.rb b/spec/migrations/db/post_migrate/20240701182755_finalize_backfill_epic_issues_into_work_item_parent_links_spec.rb
new file mode 100644
index 00000000000..fafe50d39f9
--- /dev/null
+++ b/spec/migrations/db/post_migrate/20240701182755_finalize_backfill_epic_issues_into_work_item_parent_links_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe FinalizeBackfillEpicIssuesIntoWorkItemParentLinks, feature_category: :database, migration_version: 20240701182755 do
+ describe '#up' do
+ it 'ensures the migration is completed for self-managed instances' do
+ # enqueue the migration
+ QueueBackfillEpicIssuesIntoWorkItemParentLinks.new.up
+
+ migration = Gitlab::Database::BackgroundMigration::BatchedMigration.where(
+ job_class_name: 'BackfillEpicIssuesIntoWorkItemParentLinks',
+ table_name: 'epic_issues'
+ ).first
+
+ expect(migration.status).not_to eq(6) # finalized
+
+ migrate!
+
+ expect(migration.reload.status).to eq(6)
+ QueueBackfillEpicIssuesIntoWorkItemParentLinks.new.down
+ end
+ end
+end
diff --git a/spec/models/import/source_user_placeholder_reference_spec.rb b/spec/models/import/source_user_placeholder_reference_spec.rb
new file mode 100644
index 00000000000..e441e065f59
--- /dev/null
+++ b/spec/models/import/source_user_placeholder_reference_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Import::SourceUserPlaceholderReference, feature_category: :importers do
+ describe 'associations' do
+ it { is_expected.to belong_to(:source_user).class_name('Import::SourceUser') }
+ end
+
+ describe 'validations' do
+ it { is_expected.to validate_presence_of(:user_reference_column) }
+ it { is_expected.to validate_presence_of(:model) }
+ it { is_expected.to validate_presence_of(:namespace_id) }
+ it { is_expected.to validate_presence_of(:source_user_id) }
+ it { is_expected.to validate_numericality_of(:numeric_key).only_integer.is_greater_than(0) }
+ it { expect(described_class).to validate_jsonb_schema(['composite_key']) }
+ it { is_expected.to allow_value({ id: 1 }).for(:composite_key) }
+ it { is_expected.to allow_value({ id: '1' }).for(:composite_key) }
+ it { is_expected.to allow_value({ foo: '1', bar: 2 }).for(:composite_key) }
+ it { is_expected.not_to allow_value({}).for(:composite_key) }
+ it { is_expected.not_to allow_value({ id: 'foo' }).for(:composite_key) }
+ it { is_expected.not_to allow_value(1).for(:composite_key) }
+
+ describe '#validate_numeric_or_composite_key_present' do
+ def validation_errors(...)
+ described_class.new(...).tap(&:validate)
+ .errors
+ .where(:base)
+ end
+
+ it 'must have numeric_key or composite_key present', :aggregate_failures do
+ expect(validation_errors).to be_present
+ expect(validation_errors(numeric_key: 1)).to be_blank
+ expect(validation_errors(composite_key: { id: 1 })).to be_blank
+ expect(validation_errors(numeric_key: 1, composite_key: { id: 1 })).to be_present
+ end
+ end
+ end
+
+ it 'is destroyed when source user is destroyed' do
+ reference = create(:import_source_user_placeholder_reference)
+
+ expect { reference.source_user.destroy! }.to change { described_class.count }.by(-1)
+ end
+end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 51e32d473a6..ce0e3ea1c6e 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -196,6 +196,7 @@ RSpec.describe Project, factory_default: :keep, feature_category: :groups_and_pr
it { is_expected.to have_many(:alert_hooks_integrations).class_name('Integration') }
it { is_expected.to have_many(:incident_hooks_integrations).class_name('Integration') }
it { is_expected.to have_many(:relation_import_trackers).class_name('Projects::ImportExport::RelationImportTracker') }
+ it { is_expected.to have_many(:all_protected_branches).class_name('ProtectedBranch') }
# GitLab Pages
it { is_expected.to have_many(:pages_domains) }
diff --git a/spec/models/protected_branch_spec.rb b/spec/models/protected_branch_spec.rb
index b34e4a7bf30..06f77ea9ebb 100644
--- a/spec/models/protected_branch_spec.rb
+++ b/spec/models/protected_branch_spec.rb
@@ -83,34 +83,14 @@ RSpec.describe ProtectedBranch, feature_category: :source_code_management do
end
describe '.protected_refs' do
- let_it_be(:project) { create(:project) }
+ let(:project) { build_stubbed(:project) }
subject { described_class.protected_refs(project) }
- context 'when feature flag enabled' do
- before do
- stub_feature_flags(group_protected_branches: true)
- stub_feature_flags(allow_protected_branches_for_group: true)
- end
+ it 'call `all_protected_branches`' do
+ expect(project).to receive(:all_protected_branches)
- it 'call `all_protected_branches`' do
- expect(project).to receive(:all_protected_branches)
-
- subject
- end
- end
-
- context 'when feature flag disabled' do
- before do
- stub_feature_flags(group_protected_branches: false)
- stub_feature_flags(allow_protected_branches_for_group: false)
- end
-
- it 'call `protected_branches`' do
- expect(project).to receive(:protected_branches)
-
- subject
- end
+ subject
end
end
diff --git a/spec/requests/api/branches_spec.rb b/spec/requests/api/branches_spec.rb
index c1fe5c6d0a9..45ab91c74e8 100644
--- a/spec/requests/api/branches_spec.rb
+++ b/spec/requests/api/branches_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
RSpec.describe API::Branches, feature_category: :source_code_management do
let_it_be(:user) { create(:user) }
- let(:project) { create(:project, :repository, creator: user, path: 'my.project', create_branch: 'ends-with.txt') }
+ let(:project) { create(:project, :in_group, :repository, creator: user, path: 'my.project', create_branch: 'ends-with.txt') }
let(:guest) { create(:user, guest_of: project) }
let(:branch_name) { 'feature' }
let(:branch_sha) { '0b4bc9a49b562e85de7cc9e834518ea6828729b9' }
@@ -295,10 +295,79 @@ RSpec.describe API::Branches, feature_category: :source_code_management do
new_branch_name = 'protected-branch'
::Branches::CreateService.new(project, current_user).execute(new_branch_name, 'master')
create(:protected_branch, name: new_branch_name, project: project)
+ create(:protected_branch, name: new_branch_name, project: nil, group: project.group)
expect do
get api(route, current_user), params: { per_page: 100 }
- end.not_to exceed_query_limit(control).with_threshold(1)
+ end.not_to exceed_query_limit(control)
+ end
+ end
+
+ context 'with group protected branches' do
+ subject(:request) { get api(route, user) }
+
+ let!(:group_protected_branch) do
+ create(:protected_branch,
+ *access_levels,
+ project: nil,
+ group: project.group,
+ name: '*'
+ )
+ end
+
+ context 'maintainers allowed to push and merge' do
+ let(:access_levels) { [] }
+
+ it 'responds with correct attributes related to push and merge' do
+ request
+
+ expect(json_response.dig(0, 'developers_can_merge')).to be_falsey
+ expect(json_response.dig(0, 'developers_can_push')).to be_falsey
+ expect(json_response.dig(0, 'can_push')).to be_truthy
+ end
+
+ context 'and there is a more permissive project level protected branch' do
+ let!(:project_level_protected_branch) do
+ create(:protected_branch,
+ :developers_can_merge,
+ :developers_can_push,
+ project: project,
+ name: '*'
+ )
+ end
+
+ it 'responds with correct attributes related to push and merge' do
+ request
+
+ expect(json_response.dig(0, 'developers_can_merge')).to be_truthy
+ expect(json_response.dig(0, 'developers_can_push')).to be_truthy
+ expect(json_response.dig(0, 'can_push')).to be_truthy
+ end
+ end
+ end
+
+ context 'when developers can push and merge' do
+ let(:access_levels) { %i[developers_can_merge developers_can_push] }
+
+ it 'responds with correct attributes related to push and merge' do
+ request
+
+ expect(json_response.dig(0, 'developers_can_merge')).to be_truthy
+ expect(json_response.dig(0, 'developers_can_push')).to be_truthy
+ expect(json_response.dig(0, 'can_push')).to be_truthy
+ end
+ end
+
+ context 'when no one can push and merge' do
+ let(:access_levels) { %i[no_one_can_merge no_one_can_push] }
+
+ it 'responds with correct attributes related to push and merge' do
+ request
+
+ expect(json_response.dig(0, 'developers_can_merge')).to be_falsey
+ expect(json_response.dig(0, 'developers_can_push')).to be_falsey
+ expect(json_response.dig(0, 'can_push')).to be_falsey
+ end
end
end
diff --git a/spec/support/shared_examples/features/wiki/user_views_wiki_page_shared_examples.rb b/spec/support/shared_examples/features/wiki/user_views_wiki_page_shared_examples.rb
index f9a34f04237..c4540c8ca2f 100644
--- a/spec/support/shared_examples/features/wiki/user_views_wiki_page_shared_examples.rb
+++ b/spec/support/shared_examples/features/wiki/user_views_wiki_page_shared_examples.rb
@@ -247,6 +247,25 @@ RSpec.shared_examples 'User views a wiki page' do
end
end
+ context 'when a page has headings' do
+ before do
+ wiki_page.update(content: "# Heading 1\n\n## Heading 1.1\n\n### Heading 1.1.1\n\n# Heading 2") # rubocop:disable Rails/SaveBang -- not an ActiveRecord
+ end
+
+ it 'displays the table of contents for the page' do
+ visit(wiki_page_path(wiki, wiki_page))
+
+ within '.js-wiki-toc' do
+ expect(page).to have_content('On this page')
+
+ expect(page).to have_content('Heading 1')
+ expect(page).to have_content('Heading 1.1')
+ expect(page).to have_content('Heading 1.1.1')
+ expect(page).to have_content('Heading 2')
+ end
+ end
+ end
+
context 'when page has invalid content encoding' do
let(:content) { (+'whatever').force_encoding('ISO-8859-1') }
diff --git a/workhorse/cmd/gitlab-workhorse/channel_test.go b/workhorse/cmd/gitlab-workhorse/channel_test.go
index 6e8ad945fd2..11b414cc526 100644
--- a/workhorse/cmd/gitlab-workhorse/channel_test.go
+++ b/workhorse/cmd/gitlab-workhorse/channel_test.go
@@ -174,7 +174,7 @@ func webSocketHandler(upgrader *websocket.Upgrader, connCh chan connWithReq) htt
func channelOkBody(remote *httptest.Server, header http.Header, subprotocols ...string) *api.Response {
out := &api.Response{
Channel: &api.ChannelSettings{
- WsURL: websocketURL(remote.URL),
+ Url: websocketURL(remote.URL),
Header: header,
Subprotocols: subprotocols,
MaxSessionTime: 0,
diff --git a/workhorse/internal/api/channel_settings.go b/workhorse/internal/api/channel_settings.go
index 6e8d2f13b07..779d2ad7e69 100644
--- a/workhorse/internal/api/channel_settings.go
+++ b/workhorse/internal/api/channel_settings.go
@@ -19,7 +19,7 @@ type ChannelSettings struct {
Subprotocols []string
// The websocket URL to connect to.
- WsURL string
+ Url string //nolint:revive,stylecheck // when JSON decoding, the value is provided via 'url'
// Any headers (e.g., Authorization) to send with the websocket request
Header http.Header
@@ -35,7 +35,7 @@ type ChannelSettings struct {
// URL parses the websocket URL in the ChannelSettings and returns a *url.URL.
func (t *ChannelSettings) URL() (*url.URL, error) {
- return url.Parse(t.WsURL)
+ return url.Parse(t.Url)
}
// Dialer returns a websocket Dialer configured with the settings from ChannelSettings.
@@ -72,7 +72,7 @@ func (t *ChannelSettings) Clone() *ChannelSettings {
// Dial establishes a websocket connection using the settings from ChannelSettings.
// It returns a websocket connection, an HTTP response, and an error if any.
func (t *ChannelSettings) Dial() (*websocket.Conn, *http.Response, error) {
- return t.Dialer().Dial(t.WsURL, t.Header)
+ return t.Dialer().Dial(t.Url, t.Header)
}
// Validate checks if the ChannelSettings instance is valid.
@@ -133,7 +133,7 @@ func (t *ChannelSettings) IsEqual(other *ChannelSettings) bool {
}
}
- return t.WsURL == other.WsURL &&
+ return t.Url == other.Url &&
t.CAPem == other.CAPem &&
t.MaxSessionTime == other.MaxSessionTime
}
diff --git a/workhorse/internal/api/channel_settings_test.go b/workhorse/internal/api/channel_settings_test.go
index d33d78222d2..1735a8b6e3d 100644
--- a/workhorse/internal/api/channel_settings_test.go
+++ b/workhorse/internal/api/channel_settings_test.go
@@ -9,7 +9,7 @@ import (
func channel(url string, subprotocols ...string) *ChannelSettings {
return &ChannelSettings{
- WsURL: url,
+ Url: url,
Subprotocols: subprotocols,
MaxSessionTime: 0,
}
@@ -146,7 +146,7 @@ func TestIsEqual(t *testing.T) {
{chann, chann, true},
{chann.Clone(), chann.Clone(), true},
{chann, channel("foo:"), false},
- {chann, channel(chann.WsURL), false},
+ {chann, channel(chann.Url), false},
{header(chann), header(chann), true},
{channHeader2, channHeader2, true},
{channHeader3, channHeader3, true},
diff --git a/workhorse/internal/channel/auth_checker_test.go b/workhorse/internal/channel/auth_checker_test.go
index 36a45b07c1e..b522cf5da1f 100644
--- a/workhorse/internal/channel/auth_checker_test.go
+++ b/workhorse/internal/channel/auth_checker_test.go
@@ -19,7 +19,7 @@ func checkerSeries(values ...*api.ChannelSettings) AuthCheckerFunc {
}
func TestAuthCheckerStopsWhenAuthFails(t *testing.T) {
- template := &api.ChannelSettings{WsURL: "ws://example.com"}
+ template := &api.ChannelSettings{Url: "ws://example.com"}
stopCh := make(chan error)
series := checkerSeries(template, template, template)
ac := NewAuthChecker(series, template, stopCh)
@@ -35,9 +35,9 @@ func TestAuthCheckerStopsWhenAuthFails(t *testing.T) {
}
func TestAuthCheckerStopsWhenAuthChanges(t *testing.T) {
- template := &api.ChannelSettings{WsURL: "ws://example.com"}
+ template := &api.ChannelSettings{Url: "ws://example.com"}
changed := template.Clone()
- changed.WsURL = "wss://example.com"
+ changed.Url = "wss://example.com"
stopCh := make(chan error)
series := checkerSeries(template, changed, template)
ac := NewAuthChecker(series, template, stopCh)