diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 17:02:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 17:02:45 +0300 |
commit | 80f61b4035607d7cd87de993b8f5e996bde3481f (patch) | |
tree | 06b12f51e97d87192e3dd0e05edf55143645b894 /spec/features/merge_request | |
parent | 4ab54c2233e91f60a80e5b6fa2181e6899fdcc3e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/merge_request')
4 files changed, 6 insertions, 6 deletions
diff --git a/spec/features/merge_request/user_posts_notes_spec.rb b/spec/features/merge_request/user_posts_notes_spec.rb index 7d89b8e97a6..733d79127f7 100644 --- a/spec/features/merge_request/user_posts_notes_spec.rb +++ b/spec/features/merge_request/user_posts_notes_spec.rb @@ -174,14 +174,14 @@ describe 'Merge request > User posts notes', :js do find('.js-note-edit').click end - # TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034 + # TODO: https://gitlab.com/gitlab-org/gitlab-foss/issues/48034 xit 'shows the delete link' do page.within('.note-attachment') do is_expected.to have_css('.js-note-attachment-delete') end end - # TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034 + # TODO: https://gitlab.com/gitlab-org/gitlab-foss/issues/48034 xit 'removes the attachment div and resets the edit form' do accept_confirm { find('.js-note-attachment-delete').click } is_expected.not_to have_css('.note-attachment') diff --git a/spec/features/merge_request/user_resolves_conflicts_spec.rb b/spec/features/merge_request/user_resolves_conflicts_spec.rb index dd1ec17ae51..e3ee80a47d7 100644 --- a/spec/features/merge_request/user_resolves_conflicts_spec.rb +++ b/spec/features/merge_request/user_resolves_conflicts_spec.rb @@ -142,7 +142,7 @@ describe 'Merge request > User resolves conflicts', :js do end end - # TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034 + # TODO: https://gitlab.com/gitlab-org/gitlab-foss/issues/48034 xit 'conflicts are resolved in Edit inline mode' do within find('.files-wrapper .diff-file', text: 'files/markdown/ruby-style-guide.md') do wait_for_requests diff --git a/spec/features/merge_request/user_sees_discussions_spec.rb b/spec/features/merge_request/user_sees_discussions_spec.rb index 48f5814322a..319eee0c55a 100644 --- a/spec/features/merge_request/user_sees_discussions_spec.rb +++ b/spec/features/merge_request/user_sees_discussions_spec.rb @@ -74,7 +74,7 @@ describe 'Merge request > User sees threads', :js do visit project_merge_request_path(project, merge_request) end - # TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034 + # TODO: https://gitlab.com/gitlab-org/gitlab-foss/issues/48034 # context 'a regular commit comment' do # let(:note) { create(:note_on_commit, project: project) } # diff --git a/spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb b/spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb index 4d801c6ff11..29b8dc19860 100644 --- a/spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb +++ b/spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb @@ -34,7 +34,7 @@ describe 'Merge request < User sees mini pipeline graph', :js do create(:ci_build, :manual, pipeline: pipeline, when: 'manual') end - # TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034 + # TODO: https://gitlab.com/gitlab-org/gitlab-foss/issues/48034 xit 'avoids repeated database queries' do before = ActiveRecord::QueryRecorder.new { visit_merge_request(format: :json, serializer: 'widget') } @@ -56,7 +56,7 @@ describe 'Merge request < User sees mini pipeline graph', :js do end # Status icon button styles should update as described in - # https://gitlab.com/gitlab-org/gitlab-ce/issues/42769 + # https://gitlab.com/gitlab-org/gitlab-foss/issues/42769 it 'has unique styles for default, :hover, :active, and :focus states' do find('.mini-pipeline-graph-dropdown-toggle') default_background_color = evaluate_script("$('.mini-pipeline-graph-dropdown-toggle:visible').css('background-color');") |