Commit 06a187cf authored by Filipa Lacerda's avatar Filipa Lacerda

Update missing paths

parent 4de9710a
<script> <script>
import statusIcon from '../mr_widget_status_icon'; import statusIcon from '../mr_widget_status_icon.vue';
export default { export default {
name: 'MRWidgetChecking', name: 'MRWidgetChecking',
......
<script> <script>
import mrWidgetAuthorTime from '../../components/mr_widget_author_time'; import mrWidgetAuthorTime from '../../components/mr_widget_author_time';
import statusIcon from '../mr_widget_status_icon'; import statusIcon from '../mr_widget_status_icon.vue';
export default { export default {
name: 'MRWidgetClosed', name: 'MRWidgetClosed',
......
<script> <script>
import statusIcon from '../mr_widget_status_icon'; import statusIcon from '../mr_widget_status_icon.vue';
export default { export default {
name: 'MRWidgetConflicts', name: 'MRWidgetConflicts',
......
...@@ -19,8 +19,8 @@ describe('MRWidgetMerging', () => { ...@@ -19,8 +19,8 @@ describe('MRWidgetMerging', () => {
it('renders information about merge request being merged', () => { it('renders information about merge request being merged', () => {
expect( expect(
vm.$el.querySelector('.media-body').textContent.trim(), vm.$el.querySelector('.media-body').textContent.trim().replace(/\s\s+/g, ' ').replace(/[\r\n]+/g, ' '),
).toEqual('This merge request is in the process of being merged'); ).toContain('This merge request is in the process of being merged');
}); });
it('renders branch information', () => { it('renders branch information', () => {
......
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