Commit 2e3b1b28 authored by Michel Engelen's avatar Michel Engelen

updated specs for features

parent 4f0b6a7a
require 'spec_helper'
describe 'Discussion Comments Epic', :js do
describe 'Thread Comments Epic', :js do
let(:user) { create(:user) }
let(:epic) { create(:epic) }
......@@ -12,5 +12,5 @@ describe 'Discussion Comments Epic', :js do
visit group_epic_path(epic.group, epic)
end
it_behaves_like 'discussion comments', 'epic'
it_behaves_like 'thread comments', 'epic'
end
......@@ -54,7 +54,7 @@ describe 'Epic show', :js do
end
end
it 'shows epic discussion filter dropdown' do
it 'shows epic thread filter dropdown' do
page.within('.js-epic-tabs-container') do
expect(find('.js-discussion-filter-container #discussion-filter-dropdown')).to have_content('Show all activity')
end
......@@ -97,7 +97,7 @@ describe 'Epic show', :js do
end
end
it 'does not show discussion filter dropdown' do
it 'does not show thread filter dropdown' do
expect(find('.js-epic-tabs-container')).to have_selector('.js-discussion-filter-container', visible: false)
end
......
......@@ -80,7 +80,7 @@ xdescribe 'Merge request > User approves', :js do
end
end
context 'when merge when discussions resolved is active' do
context 'when merge when threads resolved is active' do
let(:project) do
create(:project, :repository,
approvals_before_merge: 1,
......
......@@ -9,7 +9,7 @@ describe 'Merge request > User sees approval widget', :js do
sign_in(user)
end
context 'when merge when discussions resolved is active' do
context 'when merge when threads resolved is active' do
let(:project) do
create(:project, :repository,
approvals_before_merge: 1,
......
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