#222: fixed specs

spec/controllers/projects/git/git_trees_controller_spec.rb

@@ -116,7 +116,7 @@ describe Projects::Git::TreesController do
     end
 
     it 'should be able to perform restore_branch action' do
-      put :restore_branch, @params.merge(:treeish => 'conflicts')
+      put :restore_branch, @params.merge(:treeish => 'master-1', :sha => 'master')
       response.should be_success
     end
 

spec/models/project_spec.rb

@@ -117,21 +117,21 @@ describe Project do
       end
     end
 
-    context '#restore_branch' do
+    context '#create_branch' do
       before do
         project.delete_branch(branch, user)
       end
 
-      xit 'ensures that returns true on success' do
+      it 'ensures that returns true on success' do
-        project.restore_branch(branch.name, branch.commit.id).should be_true
+        project.create_branch(branch.name, branch.commit.id, user).should be_true
       end
 
-      it 'ensures that branch has been restored' do
+      it 'ensures that branch has been created' do
-        lambda { project.restore_branch(branch.name, branch.commit.id) }.should change{ project.repo.branches.count }.by(1)
+        lambda { project.create_branch(branch.name, branch.commit.id, user) }.should change{ project.repo.branches.count }.by(1)
       end
 
-      xit 'ensures that returns false on restore wrong branch' do
+      it 'ensures that returns false on create wrong branch' do
-        project.restore_branch(branch.name, GitHook::ZERO).should be_false
+        project.create_branch(branch.name, GitHook::ZERO, user).should be_false
       end
     end