Merge branch 'master' into discussions

Conflicts:
	app/assets/stylesheets/main.scss
	app/models/project.rb
	app/views/notes/_common_form.html.haml
	app/views/notes/_per_line_form.html.haml
	lib/gitlab/markdown.rb
	spec/models/note_spec.rb

spec/roles/account_role_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe User, "Account" do
+  describe 'normal user' do
+    let(:user) { create(:user, name: 'John Smith') }
+
+    it { user.is_admin?.should be_false }
+    it { user.require_ssh_key?.should be_true }
+    it { user.can_create_group?.should be_false }
+    it { user.can_create_project?.should be_true }
+    it { user.first_name.should == 'John' }
+  end
+
+  describe 'blocking user' do
+    let(:user) { create(:user, name: 'John Smith') }
+
+    it "should block user" do
+      user.block
+      user.blocked.should be_true
+    end
+  end
+
+  describe 'projects' do
+    before do
+      ActiveRecord::Base.observers.enable(:user_observer)
+      @user = create :user
+      @project = create :project, namespace: @user.namespace
+    end
+
+    it { @user.authorized_projects.should include(@project) }
+    it { @user.my_own_projects.should include(@project) }
+  end
+
+  describe 'namespaced' do
+    before do
+      ActiveRecord::Base.observers.enable(:user_observer)
+      @user = create :user
+      @project = create :project, namespace: @user.namespace
+    end
+
+    it { @user.several_namespaces?.should be_false }
+    it { @user.namespaces.should == [@user.namespace] }
+  end
+end

spec/roles/repository_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Project, "Repository" do
-  let(:project) { build(:project) }
+  let(:project) { create(:project) }
 
   describe "#empty_repo?" do
     it "should return true if the repo doesn't exist" do
@@ -69,4 +69,91 @@ describe Project, "Repository" do
       project.root_ref?('stable').should be_false
     end
   end
+
+  describe :repo do
+    it "should return valid repo" do
+      project.repo.should be_kind_of(Grit::Repo)
+    end
+
+    it "should return nil" do
+      lambda { Project.new(path: "invalid").repo }.should raise_error(Grit::NoSuchPathError)
+    end
+
+    it "should return nil" do
+      lambda { Project.new.repo }.should raise_error(TypeError)
+    end
+  end
+
+  describe :commit do
+    it "should return first head commit if without params" do
+      project.commit.id.should == project.repo.commits.first.id
+    end
+
+    it "should return valid commit" do
+      project.commit(ValidCommit::ID).should be_valid_commit
+    end
+
+    it "should return nil" do
+      project.commit("+123_4532530XYZ").should be_nil
+    end
+  end
+
+  describe :tree do
+    before do
+      @commit = project.commit(ValidCommit::ID)
+    end
+
+    it "should raise error w/o arguments" do
+      lambda { project.tree }.should raise_error
+    end
+
+    it "should return root tree for commit" do
+      tree = project.tree(@commit)
+      tree.contents.size.should == ValidCommit::FILES_COUNT
+      tree.contents.map(&:name).should == ValidCommit::FILES
+    end
+
+    it "should return root tree for commit with correct path" do
+      tree = project.tree(@commit, ValidCommit::C_FILE_PATH)
+      tree.contents.map(&:name).should == ValidCommit::C_FILES
+    end
+
+    it "should return root tree for commit with incorrect path" do
+      project.tree(@commit, "invalid_path").should be_nil
+    end
+  end
+
+  describe "fresh commits" do
+    let(:project) { create(:project) }
+
+    it { project.fresh_commits(3).count.should == 3 }
+    it { project.fresh_commits.first.id.should == "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a" }
+    it { project.fresh_commits.last.id.should == "f403da73f5e62794a0447aca879360494b08f678" }
+  end
+
+  describe "commits_between" do
+    let(:project) { create(:project) }
+
+    subject do
+      commits = project.commits_between("3a4b4fb4cde7809f033822a171b9feae19d41fff",
+                                        "8470d70da67355c9c009e4401746b1d5410af2e3")
+      commits.map { |c| c.id }
+    end
+
+    it { should have(3).elements }
+    it { should include("f0f14c8eaba69ebddd766498a9d0b0e79becd633") }
+    it { should_not include("bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a") }
+  end
+
+  describe :valid_repo? do
+    it "should be valid repo" do
+      project = create(:project)
+      project.valid_repo?.should be_true
+    end
+
+    it "should be invalid repo" do
+      project = Project.new(name: "ok_name", path: "/INVALID_PATH/", path: "NEOK")
+      project.valid_repo?.should be_false
+    end
+  end
 end