Commit c0d97cb5 authored by Nikola Milojevic's avatar Nikola Milojevic

Merge branch 'do-not-default-to-my-company-or-team' into 'master'

Do not select "My company or team" radio box by default

See merge request gitlab-org/gitlab!74681
parents 848f1fbd f32bcea3
......@@ -15,7 +15,7 @@
= f.label :setup_for_company, _('Who will be using this group?')
.gl-display-flex.gl-flex-direction-column.gl-lg-flex-direction-row
.gl-flex-grow-1.gl-display-flex.gl-align-items-center
= f.radio_button :setup_for_company, true, checked: true
= f.radio_button :setup_for_company, true
= f.label :setup_for_company, _('My company or team'), class: 'gl-font-weight-normal gl-mb-0 gl-ml-2', value: 'true'
.gl-flex-grow-1.gl-display-flex.gl-align-items-center
= f.radio_button :setup_for_company, false
......
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe 'groups/new.html.haml' do
let_it_be(:user) { create(:user) }
let_it_be(:group) { build(:group, namespace_settings: build(:namespace_settings)) }
before do
assign(:group, group)
assign(:current_user, user)
allow(view).to receive(:current_user).and_return(user)
allow(view).to receive(:captcha_required?).and_return(false)
allow(view).to receive(:import_sources_enabled?).and_return(false)
render
end
describe 'setup_for_company field' do
it 'does not have a default selection', :aggregate_failures do
expect(rendered).to have_field('My company or team')
expect(rendered).not_to have_checked_field('My company or team')
expect(rendered).to have_field('Just me')
expect(rendered).not_to have_checked_field('Just me')
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment