Commit 46e60191 authored by Stan Hu's avatar Stan Hu

Merge branch 'lucyfox-master-patch-97433' into 'master'

change more it to specify

See merge request gitlab-org/gitlab!51007
parents 4b0b6cb6 db5dd9f6
...@@ -102,7 +102,7 @@ RSpec.describe ProjectsHelper do ...@@ -102,7 +102,7 @@ RSpec.describe ProjectsHelper do
allow(helper).to receive(:current_user).and_return(user) allow(helper).to receive(:current_user).and_return(user)
end end
it do specify do
expect(helper.group_project_templates_count(parent_group.id)).to eq 1 expect(helper.group_project_templates_count(parent_group.id)).to eq 1
end end
...@@ -111,7 +111,7 @@ RSpec.describe ProjectsHelper do ...@@ -111,7 +111,7 @@ RSpec.describe ProjectsHelper do
template_project.update!(marked_for_deletion_at: Date.current) template_project.update!(marked_for_deletion_at: Date.current)
end end
it do specify do
expect(helper.group_project_templates_count(parent_group.id)).to eq 0 expect(helper.group_project_templates_count(parent_group.id)).to eq 0
end end
end end
...@@ -449,7 +449,7 @@ RSpec.describe ProjectsHelper do ...@@ -449,7 +449,7 @@ RSpec.describe ProjectsHelper do
context 'when project has delayed deletion enabled' do context 'when project has delayed deletion enabled' do
let(:enabled) { true } let(:enabled) { true }
it do specify do
deletion_date = helper.permanent_deletion_date(Time.now.utc) deletion_date = helper.permanent_deletion_date(Time.now.utc)
expect(subject).to eq "Deleting a project places it into a read-only state until #{deletion_date}, at which point the project will be permanently deleted. Are you ABSOLUTELY sure?" expect(subject).to eq "Deleting a project places it into a read-only state until #{deletion_date}, at which point the project will be permanently deleted. Are you ABSOLUTELY sure?"
...@@ -459,7 +459,7 @@ RSpec.describe ProjectsHelper do ...@@ -459,7 +459,7 @@ RSpec.describe ProjectsHelper do
context 'when project has delayed deletion disabled' do context 'when project has delayed deletion disabled' do
let(:enabled) { false } let(:enabled) { false }
it do specify do
expect(subject).to eq "You are going to delete #{project.full_name}. Deleted projects CANNOT be restored! Are you ABSOLUTELY sure?" expect(subject).to eq "You are going to delete #{project.full_name}. Deleted projects CANNOT be restored! Are you ABSOLUTELY sure?"
end 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