Commit 161ba793 authored by Vitaly Slobodin's avatar Vitaly Slobodin

Merge branch '229199-migrate-loading-button-commit-sidebar-form' into 'master'

Replace LoadingButton in IDE commit_sidebar/form.vue with GlButton

See merge request gitlab-org/gitlab!39904
parents cec6b374 8b116ce1
<script>
import { mapState, mapActions, mapGetters } from 'vuex';
import { GlModal, GlSafeHtmlDirective } from '@gitlab/ui';
import { GlModal, GlSafeHtmlDirective, GlButton } from '@gitlab/ui';
import { n__, __ } from '~/locale';
import LoadingButton from '~/vue_shared/components/loading_button.vue';
import CommitMessageField from './message_field.vue';
import Actions from './actions.vue';
import SuccessMessage from './success_message.vue';
......@@ -12,10 +11,10 @@ import { createUnexpectedCommitError } from '../../lib/errors';
export default {
components: {
Actions,
LoadingButton,
CommitMessageField,
SuccessMessage,
GlModal,
GlButton,
},
directives: {
SafeHtml: GlSafeHtmlDirective,
......@@ -156,12 +155,16 @@ export default {
/>
<div class="clearfix gl-mt-5">
<actions />
<loading-button
<gl-button
:loading="submitCommitLoading"
:label="commitButtonText"
container-class="btn btn-success btn-sm float-left qa-commit-button"
class="float-left qa-commit-button"
size="small"
category="primary"
variant="success"
@click="commit"
/>
>
{{ __('Commit') }}
</gl-button>
<button
v-if="!discardDraftButtonDisabled"
type="button"
......@@ -170,14 +173,17 @@ export default {
>
{{ __('Discard draft') }}
</button>
<button
<gl-button
v-else
type="button"
class="btn btn-default btn-sm float-right"
class="float-right"
category="secondary"
variant="default"
size="small"
@click="toggleIsCompact"
>
{{ __('Collapse') }}
</button>
</gl-button>
</div>
<gl-modal
ref="commitErrorModal"
......
......@@ -23,8 +23,6 @@ RSpec.describe 'User creates new blob', :js do
ide_commit
click_button('Commit')
expect(page).to have_content('All changes are committed')
expect(project.repository.blob_at('master', 'dummy-file').data).to eql("Hello world\n")
end
......
......@@ -27,9 +27,7 @@ RSpec.describe 'Projects > Files > Project owner sees a link to create a license
ide_commit
click_button('Commit')
expect(current_path).to eq("/-/ide/project/#{project.full_path}/tree/master/-/")
expect(current_path).to eq("/-/ide/project/#{project.full_path}/tree/master/-/LICENSE/")
expect(page).to have_content('All changes are committed')
......
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