Commit e9500f28 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '122800-improve-spec-description-for-mr-widget-ready-to-merge' into 'master'

Improve spec context description for commit message area

Closes #122800

See merge request gitlab-org/gitlab!31526
parents e34046fb 0c672da2
...@@ -920,8 +920,8 @@ describe('ReadyToMerge', () => { ...@@ -920,8 +920,8 @@ describe('ReadyToMerge', () => {
}); });
}); });
describe('Commit message area', () => { describe('Merge request project settings', () => {
describe('when using merge commits', () => { describe('when the merge commit merge method is enabled', () => {
beforeEach(() => { beforeEach(() => {
vm = createComponent({ vm = createComponent({
mr: { ffOnlyEnabled: false }, mr: { ffOnlyEnabled: false },
...@@ -937,7 +937,7 @@ describe('ReadyToMerge', () => { ...@@ -937,7 +937,7 @@ describe('ReadyToMerge', () => {
}); });
}); });
describe('when fast-forward merge is enabled', () => { describe('when the fast-forward merge method is enabled', () => {
beforeEach(() => { beforeEach(() => {
vm = createComponent({ vm = createComponent({
mr: { ffOnlyEnabled: true }, mr: { ffOnlyEnabled: true },
......
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