diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 00:09:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 00:09:21 +0300 |
commit | 06bb4eba7828ce59fde366734828458c037059b4 (patch) | |
tree | 44b95a53123d91684cc1c67716ef87cc1c0964fb | |
parent | 219eead23f9feb5da9ec378c451d773aea2dfe61 (diff) |
Add latest changes from gitlab-org/gitlab@master
-rw-r--r-- | app/assets/javascripts/confirm_modal.js | 33 | ||||
-rw-r--r-- | app/assets/javascripts/editor/editor_lite.js | 1 | ||||
-rw-r--r-- | app/assets/javascripts/vue_shared/components/confirm_modal.vue | 58 | ||||
-rw-r--r-- | app/assets/stylesheets/framework.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/editor-lite.scss | 5 | ||||
-rw-r--r-- | app/controllers/dashboard/projects_controller.rb | 5 | ||||
-rw-r--r-- | changelogs/unreleased/fix-missing-rss-feed-events.yml | 5 | ||||
-rw-r--r-- | doc/user/clusters/applications.md | 2 | ||||
-rw-r--r-- | spec/controllers/dashboard/projects_controller_spec.rb | 51 | ||||
-rw-r--r-- | spec/frontend/confirm_modal_spec.js | 7 | ||||
-rw-r--r-- | spec/frontend/vue_shared/components/confirm_modal_spec.js | 80 |
11 files changed, 144 insertions, 104 deletions
diff --git a/app/assets/javascripts/confirm_modal.js b/app/assets/javascripts/confirm_modal.js index ff29d5fa355..4b4fdf03873 100644 --- a/app/assets/javascripts/confirm_modal.js +++ b/app/assets/javascripts/confirm_modal.js @@ -3,40 +3,9 @@ import ConfirmModal from '~/vue_shared/components/confirm_modal.vue'; const mountConfirmModal = () => { return new Vue({ - data() { - return { - path: '', - method: '', - modalAttributes: null, - showModal: false, - }; - }, - mounted() { - document.querySelectorAll('.js-confirm-modal-button').forEach(button => { - button.addEventListener('click', e => { - e.preventDefault(); - - this.path = button.dataset.path; - this.method = button.dataset.method; - this.modalAttributes = JSON.parse(button.dataset.modalAttributes); - this.showModal = true; - }); - }); - }, - methods: { - dismiss() { - this.showModal = false; - }, - }, render(h) { return h(ConfirmModal, { - props: { - path: this.path, - method: this.method, - modalAttributes: this.modalAttributes, - showModal: this.showModal, - }, - on: { dismiss: this.dismiss }, + props: { selector: '.js-confirm-modal-button' }, }); }, }).$mount(); diff --git a/app/assets/javascripts/editor/editor_lite.js b/app/assets/javascripts/editor/editor_lite.js index c2723b1d506..663d14bcfcb 100644 --- a/app/assets/javascripts/editor/editor_lite.js +++ b/app/assets/javascripts/editor/editor_lite.js @@ -11,6 +11,7 @@ export default class Editor { this.instance = null; this.model = null; this.options = { + extraEditorClassName: 'gl-editor-lite', ...defaultEditorOptions, ...options, }; diff --git a/app/assets/javascripts/vue_shared/components/confirm_modal.vue b/app/assets/javascripts/vue_shared/components/confirm_modal.vue index c77827205d6..52ff906ccec 100644 --- a/app/assets/javascripts/vue_shared/components/confirm_modal.vue +++ b/app/assets/javascripts/vue_shared/components/confirm_modal.vue @@ -1,49 +1,45 @@ <script> import { GlModal } from '@gitlab/ui'; import csrf from '~/lib/utils/csrf'; +import { uniqueId } from 'lodash'; export default { components: { GlModal, }, props: { - modalAttributes: { - type: Object, - required: false, - default: () => { - return {}; - }, - }, - path: { - type: String, - required: false, - default: '', - }, - method: { + selector: { type: String, - required: false, - default: '', - }, - showModal: { - type: Boolean, - required: false, - default: false, + required: true, }, }, - watch: { - showModal(val) { - if (val) { - // Wait for v-if to render - this.$nextTick(() => { - this.openModal(); - }); - } - }, + data() { + return { + modalId: uniqueId('confirm-modal-'), + path: '', + method: '', + modalAttributes: {}, + }; + }, + mounted() { + document.querySelectorAll(this.selector).forEach(button => { + button.addEventListener('click', e => { + e.preventDefault(); + + this.path = button.dataset.path; + this.method = button.dataset.method; + this.modalAttributes = JSON.parse(button.dataset.modalAttributes); + this.openModal(); + }); + }); }, methods: { openModal() { this.$refs.modal.show(); }, + closeModal() { + this.$refs.modal.hide(); + }, submitModal() { this.$refs.form.submit(); }, @@ -54,11 +50,11 @@ export default { <template> <gl-modal - v-if="showModal" ref="modal" + :modal-id="modalId" v-bind="modalAttributes" @primary="submitModal" - @canceled="$emit('dismiss')" + @cancel="closeModal" > <form ref="form" :action="path" method="post"> <!-- Rails workaround for <form method="delete" /> diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index 9032dd28b80..338a8c5497c 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -70,3 +70,4 @@ @import 'framework/system_messages'; @import "framework/spinner"; @import 'framework/card'; +@import 'framework/editor-lite'; diff --git a/app/assets/stylesheets/framework/editor-lite.scss b/app/assets/stylesheets/framework/editor-lite.scss new file mode 100644 index 00000000000..75d511d7f66 --- /dev/null +++ b/app/assets/stylesheets/framework/editor-lite.scss @@ -0,0 +1,5 @@ +.monaco-editor.gl-editor-lite { + .line-numbers { + @include gl-pt-0; + } +} diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb index 039991e07a2..711be67f8f9 100644 --- a/app/controllers/dashboard/projects_controller.rb +++ b/app/controllers/dashboard/projects_controller.rb @@ -33,7 +33,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController # rubocop: disable CodeReuse/ActiveRecord def starred @projects = load_projects(params.merge(starred: true)) - .includes(:forked_from_project, :tags) + .includes(:forked_from_project, :tags).page(params[:page]) @groups = [] @@ -51,7 +51,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController private def projects - @projects ||= load_projects(params.merge(non_public: true)) + @projects ||= load_projects(params.merge(non_public: true)).page(params[:page]) end def render_projects @@ -73,7 +73,6 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController .execute .includes(:route, :creator, :group, namespace: [:route, :owner]) .preload(:project_feature) - .page(finder_params[:page]) prepare_projects_for_rendering(projects) end diff --git a/changelogs/unreleased/fix-missing-rss-feed-events.yml b/changelogs/unreleased/fix-missing-rss-feed-events.yml new file mode 100644 index 00000000000..9fbacc6d739 --- /dev/null +++ b/changelogs/unreleased/fix-missing-rss-feed-events.yml @@ -0,0 +1,5 @@ +---
+title: Fix missing RSS feed events
+merge_request: 19524
+author:
+type: fixed
diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md index 3af5f43dca5..4ee3cbd4eb3 100644 --- a/doc/user/clusters/applications.md +++ b/doc/user/clusters/applications.md @@ -680,7 +680,7 @@ available configuration options. [Cilium](https://cilium.io/) is a networking plugin for Kubernetes that you can use to implement support for [NetworkPolicy](https://kubernetes.io/docs/concepts/services-networking/network-policies/) -resources. +resources. For more information on [Network Policies](../../topics/autodevops/index.md#network-policy), see the documentation. Enable Cilium in the `.gitlab/managed-apps/config.yaml` file to install it: diff --git a/spec/controllers/dashboard/projects_controller_spec.rb b/spec/controllers/dashboard/projects_controller_spec.rb index a13b56deb23..7ae31fc67aa 100644 --- a/spec/controllers/dashboard/projects_controller_spec.rb +++ b/spec/controllers/dashboard/projects_controller_spec.rb @@ -86,11 +86,58 @@ describe Dashboard::ProjectsController do end describe 'GET /starred.json' do + subject { get :starred, format: :json } + + let(:projects) { create_list(:project, 2, creator: user) } + before do - get :starred, format: :json + allow(Kaminari.config).to receive(:default_per_page).and_return(1) + + projects.each do |project| + project.add_developer(user) + create(:users_star_project, project_id: project.id, user_id: user.id) + end end - it { is_expected.to respond_with(:success) } + it 'returns success' do + subject + + expect(response).to have_gitlab_http_status(:ok) + end + + it 'paginates the records' do + subject + + expect(assigns(:projects).count).to eq(1) + end + end + end + + context 'atom requests' do + let(:user) { create(:user) } + + before do + sign_in(user) + end + + describe '#index' do + context 'project pagination' do + let(:projects) { create_list(:project, 2, creator: user) } + + before do + allow(Kaminari.config).to receive(:default_per_page).and_return(1) + + projects.each do |project| + project.add_developer(user) + end + end + + it 'does not paginate projects, even if page number is passed' do + get :index, format: :atom + + expect(assigns(:events).count).to eq(2) + end + end end end end diff --git a/spec/frontend/confirm_modal_spec.js b/spec/frontend/confirm_modal_spec.js index f133cef675f..89cfc3ef3a3 100644 --- a/spec/frontend/confirm_modal_spec.js +++ b/spec/frontend/confirm_modal_spec.js @@ -8,7 +8,6 @@ describe('ConfirmModal', () => { path: `${TEST_HOST}/1`, method: 'delete', modalAttributes: { - modalId: 'geo-entry-removal-modal', title: 'Remove tracking database entry', message: 'Tracking database entry will be removed. Are you sure?', okVariant: 'danger', @@ -19,7 +18,6 @@ describe('ConfirmModal', () => { path: `${TEST_HOST}/1`, method: 'post', modalAttributes: { - modalId: 'geo-entry-removal-modal', title: 'Update tracking database entry', message: 'Tracking database entry will be updated. Are you sure?', okVariant: 'success', @@ -53,6 +51,7 @@ describe('ConfirmModal', () => { const findModalOkButton = (modal, variant) => modal.querySelector(`.modal-footer .btn-${variant}`); const findModalCancelButton = modal => modal.querySelector('.modal-footer .btn-secondary'); + const modalIsHidden = () => findModal().getAttribute('aria-hidden') === 'true'; const serializeModal = (modal, buttonIndex) => { const { modalAttributes } = buttons[buttonIndex]; @@ -61,7 +60,6 @@ describe('ConfirmModal', () => { path: modal.querySelector('form').action, method: modal.querySelector('input[name="_method"]').value, modalAttributes: { - modalId: modal.id, title: modal.querySelector('.modal-title').innerHTML, message: modal.querySelector('.modal-body div').innerHTML, okVariant: [...findModalOkButton(modal, modalAttributes.okVariant).classList] @@ -92,6 +90,7 @@ describe('ConfirmModal', () => { describe('GlModal', () => { it('is rendered', () => { expect(findModal()).toExist(); + expect(modalIsHidden()).toBe(false); }); describe('Cancel Button', () => { @@ -102,7 +101,7 @@ describe('ConfirmModal', () => { }); it('closes the modal', () => { - expect(findModal()).not.toExist(); + expect(modalIsHidden()).toBe(true); }); }); }); diff --git a/spec/frontend/vue_shared/components/confirm_modal_spec.js b/spec/frontend/vue_shared/components/confirm_modal_spec.js index d3dea73e4a6..7bccd6f1a64 100644 --- a/spec/frontend/vue_shared/components/confirm_modal_spec.js +++ b/spec/frontend/vue_shared/components/confirm_modal_spec.js @@ -6,11 +6,10 @@ import ConfirmModal from '~/vue_shared/components/confirm_modal.vue'; jest.mock('~/lib/utils/csrf', () => ({ token: 'test-csrf-token' })); describe('vue_shared/components/confirm_modal', () => { - const testModalProps = { + const MOCK_MODAL_DATA = { path: `${TEST_HOST}/1`, method: 'delete', modalAttributes: { - modalId: 'test-confirm-modal', title: 'Are you sure?', message: 'This will remove item 1', okVariant: 'danger', @@ -18,8 +17,13 @@ describe('vue_shared/components/confirm_modal', () => { }, }; + const defaultProps = { + selector: '.test-button', + }; + const actionSpies = { openModal: jest.fn(), + closeModal: jest.fn(), }; let wrapper; @@ -27,7 +31,7 @@ describe('vue_shared/components/confirm_modal', () => { const createComponent = (props = {}) => { wrapper = shallowMount(ConfirmModal, { propsData: { - ...testModalProps, + ...defaultProps, ...props, }, methods: { @@ -48,28 +52,18 @@ describe('vue_shared/components/confirm_modal', () => { .wrappers.map(x => ({ name: x.attributes('name'), value: x.attributes('value') })); describe('template', () => { - describe('when showModal is false', () => { + describe('when modal data is set', () => { beforeEach(() => { createComponent(); + wrapper.vm.modalAttributes = MOCK_MODAL_DATA.modalAttributes; }); - it('does not render GlModal', () => { - expect(findModal().exists()).toBeFalsy(); - }); - }); - - describe('when showModal is true', () => { - beforeEach(() => { - createComponent({ showModal: true }); - }); - - it('renders GlModal', () => { + it('renders GlModal wtih data', () => { expect(findModal().exists()).toBeTruthy(); expect(findModal().attributes()).toEqual( expect.objectContaining({ - modalid: testModalProps.modalAttributes.modalId, - oktitle: testModalProps.modalAttributes.okTitle, - okvariant: testModalProps.modalAttributes.okVariant, + oktitle: MOCK_MODAL_DATA.modalAttributes.okTitle, + okvariant: MOCK_MODAL_DATA.modalAttributes.okVariant, }), ); }); @@ -77,25 +71,49 @@ describe('vue_shared/components/confirm_modal', () => { }); describe('methods', () => { - beforeEach(() => { - createComponent({ showModal: true }); - }); + describe('submitModal', () => { + beforeEach(() => { + createComponent(); + wrapper.vm.path = MOCK_MODAL_DATA.path; + wrapper.vm.method = MOCK_MODAL_DATA.method; + }); + + it('does not submit form', () => { + expect(findForm().element.submit).not.toHaveBeenCalled(); + }); + + describe('when modal submitted', () => { + beforeEach(() => { + findModal().vm.$emit('primary'); + }); - it('does not submit form', () => { - expect(findForm().element.submit).not.toHaveBeenCalled(); + it('submits form', () => { + expect(findFormData()).toEqual([ + { name: '_method', value: MOCK_MODAL_DATA.method }, + { name: 'authenticity_token', value: 'test-csrf-token' }, + ]); + expect(findForm().element.submit).toHaveBeenCalled(); + }); + }); }); - describe('when modal submitted', () => { + describe('closeModal', () => { beforeEach(() => { - findModal().vm.$emit('primary'); + createComponent(); }); - it('submits form', () => { - expect(findFormData()).toEqual([ - { name: '_method', value: testModalProps.method }, - { name: 'authenticity_token', value: 'test-csrf-token' }, - ]); - expect(findForm().element.submit).toHaveBeenCalled(); + it('does not close modal', () => { + expect(actionSpies.closeModal).not.toHaveBeenCalled(); + }); + + describe('when modal closed', () => { + beforeEach(() => { + findModal().vm.$emit('cancel'); + }); + + it('closes modal', () => { + expect(actionSpies.closeModal).toHaveBeenCalled(); + }); }); }); }); |