Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 4 deletions

diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb
index cd9d7c16f88..e922542a984 100644
--- a/spec/models/member_spec.rb
+++ b/spec/models/member_spec.rb
@@ -38,10 +38,6 @@ describe Member do
 
         expect(member).not_to be_valid
       end
-
-      it "is valid otherwise" do
-        expect(member).to be_valid
-      end
     end
 
     context "when an invite email is not provided" do
diff --git a/spec/models/wiki_page_spec.rb b/spec/models/wiki_page_spec.rb
index e8e80a8c7f4..0a0611bdeb8 100644
--- a/spec/models/wiki_page_spec.rb
+++ b/spec/models/wiki_page_spec.rb
@@ -577,6 +577,8 @@ describe WikiPage do
     end
 
     it 'returns false when version is nil' do
+      expect(latest_page).to receive(:version) { nil }
+
       expect(latest_page.historical?).to be_falsy
     end