Automatic merge of gitlab-org/gitlab-ce master

app/finders/concerns/finder_methods.rb

@@ -3,13 +3,13 @@
 module FinderMethods
   # rubocop: disable CodeReuse/ActiveRecord
   def find_by!(*args)
-    raise_not_found_unless_authorized execute.find_by!(*args)
+    raise_not_found_unless_authorized execute.reorder(nil).find_by!(*args)
   end
   # rubocop: enable CodeReuse/ActiveRecord
 
   # rubocop: disable CodeReuse/ActiveRecord
   def find_by(*args)
-    if_authorized execute.find_by(*args)
+    if_authorized execute.reorder(nil).find_by(*args)
   end
   # rubocop: enable CodeReuse/ActiveRecord
 

.babelrc.js → babel.config.js

+/* eslint-disable import/no-commonjs, filenames/match-regex */
+
 const BABEL_ENV = process.env.BABEL_ENV || process.env.NODE_ENV || null;
 
 const presets = [

jest.config.js

@@ -31,4 +31,5 @@ module.exports = {
     '^.+\\.js$': 'babel-jest',
     '^.+\\.vue$': 'vue-jest',
   },
+  transformIgnorePatterns: ['node_modules/(?!(@gitlab/ui)/)'],
 };

spec/finders/concerns/finder_methods_spec.rb

@@ -12,7 +12,7 @@ describe FinderMethods do
       end
 
       def execute
-        Project.all
+        Project.all.order(id: :desc)
       end
     end
   end
@@ -38,6 +38,16 @@ describe FinderMethods do
     it 'raises not found the user does not have access' do
       expect { finder.find_by!(id: unauthorized_project.id) }.to raise_error(ActiveRecord::RecordNotFound)
     end
+
+    it 'ignores ordering' do
+      # Memoise the finder result so we can add message expectations to it
+      relation = finder.execute
+      allow(finder).to receive(:execute).and_return(relation)
+
+      expect(relation).to receive(:reorder).with(nil).and_call_original
+
+      finder.find_by!(id: authorized_project.id)
+    end
   end
 
   describe '#find' do
@@ -66,5 +76,15 @@ describe FinderMethods do
     it 'returns nil when the user does not have access' do
       expect(finder.find_by(id: unauthorized_project.id)).to be_nil
     end
+
+    it 'ignores ordering' do
+      # Memoise the finder result so we can add message expectations to it
+      relation = finder.execute
+      allow(finder).to receive(:execute).and_return(relation)
+
+      expect(relation).to receive(:reorder).with(nil).and_call_original
+
+      finder.find_by(id: authorized_project.id)
+    end
   end
 end

spec/frontend/notes/components/__snapshots__/discussion_jump_to_next_button_spec.js.snap

+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`JumpToNextDiscussionButton matches the snapshot 1`] = `
+<div
+  class="btn-group"
+  role="group"
+>
+  <button
+    class="btn btn-default discussion-next-btn"
+    data-original-title="Jump to next unresolved discussion"
+    title=""
+  >
+    <icon-stub
+      cssclasses=""
+      name="comment-next"
+      size="16"
+    />
+  </button>
+</div>
+`;

spec/javascripts/notes/components/discussion_jump_to_next_button_spec.js → spec/frontend/notes/components/discussion_jump_to_next_button_spec.js

-import jumpToNextDiscussionButton from '~/notes/components/discussion_jump_to_next_button.vue';
-import { shallowMount, createLocalVue } from '@vue/test-utils';
+import JumpToNextDiscussionButton from '~/notes/components/discussion_jump_to_next_button.vue';
+import { shallowMount } from '@vue/test-utils';
 
-const localVue = createLocalVue();
-
-describe('jumpToNextDiscussionButton', () => {
+describe('JumpToNextDiscussionButton', () => {
   let wrapper;
 
   beforeEach(() => {
-    wrapper = shallowMount(jumpToNextDiscussionButton, {
-      localVue,
+    wrapper = shallowMount(JumpToNextDiscussionButton, {
       sync: false,
     });
   });
@@ -17,17 +14,17 @@ describe('jumpToNextDiscussionButton', () => {
     wrapper.destroy();
   });
 
-  it('emits onClick event on button click', done => {
+  it('matches the snapshot', () => {
+    expect(wrapper.vm.$el).toMatchSnapshot();
+  });
+
+  it('emits onClick event on button click', () => {
     const button = wrapper.find({ ref: 'button' });
 
     button.trigger('click');
 
-    localVue.nextTick(() => {
     expect(wrapper.emitted()).toEqual({
       onClick: [[]],
     });
-
-      done();
-    });
   });
 });

spec/frontend/test_setup.js

+import Vue from 'vue';
+import Translate from '~/vue_shared/translate';
 import axios from '~/lib/utils/axios_utils';
 
 const testTimeoutInMs = 300;
@@ -28,3 +30,5 @@ beforeEach(done => {
 
   done();
 });
+
+Vue.use(Translate);