Fixed protected branches and file edit

2 files changed, 13 insertions, 2 deletions

diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index e760c501bd7..91301029e89 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Commit do
-  let(:commit) { create(:project).commit }
+  let(:commit) { create(:project).repository.commit }
 
   describe CommitDecorator do
     let(:decorator) { CommitDecorator.new(commit) }
diff --git a/spec/support/stubbed_repository.rb b/spec/support/stubbed_repository.rb
index 0e5628d05ff..e6e194d70f5 100644
--- a/spec/support/stubbed_repository.rb
+++ b/spec/support/stubbed_repository.rb
@@ -1,6 +1,17 @@
+require "repository"
+require "project"
+
 # Stubs out all Git repository access done by models so that specs can run
 # against fake repositories without Grit complaining that they don't exist.
 class Project
+  def repository
+    if path == "empty" || !path
+      nil
+    else
+      GitLabTestRepo.new(path_with_namespace)
+    end
+  end
+
   def satellite
     FakeSatellite.new
   end
@@ -16,7 +27,7 @@ class Project
   end
 end
 
-class Repository
+class GitLabTestRepo < Repository
   def repo
     @repo ||= Grit::Repo.new(Rails.root.join('tmp', 'repositories', 'gitlabhq'))
   end