diff options
author | Robert Speicher <rspeicher@gmail.com> | 2017-07-07 11:42:00 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2017-07-07 11:42:00 -0400 |
commit | 7d03012f2a950804568f744b433f04ff4a7f1186 (patch) | |
tree | 6a64422b7fae96921d57b5994154eb0dd20daa5b /spec/features/milestone_spec.rb | |
parent | eef068754af7437baf327c5cb4e2b454ba40a617 (diff) | |
parent | 1dab640357fa1ba8992757499e4167fcd4ce6276 (diff) | |
download | gitlab-ce-7d03012f2a950804568f744b433f04ff4a7f1186.tar.gz |
Merge branch 'master' into rs-sign_in
Diffstat (limited to 'spec/features/milestone_spec.rb')
-rw-r--r-- | spec/features/milestone_spec.rb | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/spec/features/milestone_spec.rb b/spec/features/milestone_spec.rb index 189b277cd16..ce0c27cbe77 100644 --- a/spec/features/milestone_spec.rb +++ b/spec/features/milestone_spec.rb @@ -1,10 +1,12 @@ require 'rails_helper' feature 'Milestone', feature: true do - let(:project) { create(:empty_project, :public) } + let(:group) { create(:group, :public) } + let(:project) { create(:empty_project, :public, namespace: group) } let(:user) { create(:user) } before do + create(:group_member, group: group, user: user) project.team << [user, :master] sign_in(user) end @@ -37,8 +39,8 @@ feature 'Milestone', feature: true do end end - feature 'Open a milestone with an existing title' do - scenario 'displays validation message' do + feature 'Open a project milestone with an existing title' do + scenario 'displays validation message when there is a project milestone with same title' do milestone = create(:milestone, project: project, title: 8.7) visit new_project_milestone_path(project) @@ -47,7 +49,20 @@ feature 'Milestone', feature: true do end find('input[name="commit"]').click - expect(find('.alert-danger')).to have_content('Title has already been taken') + expect(find('.alert-danger')).to have_content('already being used for another group or project milestone.') + end + + scenario 'displays validation message when there is a group milestone with same title' do + milestone = create(:milestone, project_id: nil, group: project.group, title: 8.7) + + visit new_group_milestone_path(project.group) + + page.within '.milestone-form' do + fill_in "milestone_title", with: milestone.title + end + find('input[name="commit"]').click + + expect(find('.alert-danger')).to have_content('already being used for another group or project milestone.') end end end |