summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorNihad Abbasov <narkoz.2008@gmail.com>2011-10-26 18:46:25 +0500
committerNihad Abbasov <narkoz.2008@gmail.com>2011-10-26 18:46:25 +0500
commitd62200cad430565bd9f80befaf329297120330b5 (patch)
tree6217dd41e6f86e657513b509ed7a3f2bfdfa70ab /spec/models
parentf6a67fbad5119e3d95e33cfd4f4e4992707d5ba0 (diff)
downloadgitlab-ce-d62200cad430565bd9f80befaf329297120330b5.tar.gz
clean-up code
* Remove trailing whitespace * Converts hard-tabs into two-space soft-tabs * Remove consecutive blank lines
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/issue_spec.rb2
-rw-r--r--spec/models/key_spec.rb2
-rw-r--r--spec/models/note_spec.rb32
-rw-r--r--spec/models/project_security_spec.rb28
-rw-r--r--spec/models/project_spec.rb34
-rw-r--r--spec/models/user_spec.rb2
-rw-r--r--spec/models/users_project_spec.rb2
7 files changed, 51 insertions, 51 deletions
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index b2d594c904d..e0559ab6663 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -14,7 +14,7 @@ describe Issue do
it { should validate_presence_of(:assignee_id) }
end
- describe "Scope" do
+ describe "Scope" do
it { Issue.should respond_to :closed }
it { Issue.should respond_to :opened }
end
diff --git a/spec/models/key_spec.rb b/spec/models/key_spec.rb
index 8515f19b2f2..6522b825e14 100644
--- a/spec/models/key_spec.rb
+++ b/spec/models/key_spec.rb
@@ -10,7 +10,7 @@ describe Key do
it { should validate_presence_of(:key) }
end
- describe "Methods" do
+ describe "Methods" do
it { should respond_to :projects }
end
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 20bd41adc29..5b16ad3682c 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -13,8 +13,8 @@ describe Note do
it { Factory.create(:note,
:project => Factory.create(:project)).should be_valid }
- describe :authorization do
- before do
+ describe :authorization do
+ before do
@p1 = Factory :project
@p2 = Factory :project, :code => "alien", :path => "legit_1"
@u1 = Factory :user
@@ -24,10 +24,10 @@ describe Note do
@abilities << Ability
end
- describe :read do
- before do
- @p1.users_projects.create(:user => @u1, :read => false)
- @p1.users_projects.create(:user => @u2, :read => true)
+ describe :read do
+ before do
+ @p1.users_projects.create(:user => @u1, :read => false)
+ @p1.users_projects.create(:user => @u2, :read => true)
@p2.users_projects.create(:user => @u3, :read => true)
end
@@ -36,11 +36,11 @@ describe Note do
it { @abilities.allowed?(@u3, :read_note, @p1).should be_false }
end
- describe :write do
- before do
- @p1.users_projects.create(:user => @u1, :write => false)
- @p1.users_projects.create(:user => @u2, :write => true)
- @p2.users_projects.create(:user => @u3, :write => true)
+ describe :write do
+ before do
+ @p1.users_projects.create(:user => @u1, :write => false)
+ @p1.users_projects.create(:user => @u2, :write => true)
+ @p2.users_projects.create(:user => @u3, :write => true)
end
it { @abilities.allowed?(@u1, :write_note, @p1).should be_false }
@@ -48,11 +48,11 @@ describe Note do
it { @abilities.allowed?(@u3, :write_note, @p1).should be_false }
end
- describe :admin do
- before do
- @p1.users_projects.create(:user => @u1, :admin => false)
- @p1.users_projects.create(:user => @u2, :admin => true)
- @p2.users_projects.create(:user => @u3, :admin => true)
+ describe :admin do
+ before do
+ @p1.users_projects.create(:user => @u1, :admin => false)
+ @p1.users_projects.create(:user => @u2, :admin => true)
+ @p2.users_projects.create(:user => @u3, :admin => true)
end
it { @abilities.allowed?(@u1, :admin_note, @p1).should be_false }
diff --git a/spec/models/project_security_spec.rb b/spec/models/project_security_spec.rb
index 8eb8ee80f6c..f80294639f9 100644
--- a/spec/models/project_security_spec.rb
+++ b/spec/models/project_security_spec.rb
@@ -1,8 +1,8 @@
require 'spec_helper'
describe Project do
- describe :authorization do
- before do
+ describe :authorization do
+ before do
@p1 = Factory :project
@u1 = Factory :user
@u2 = Factory :user
@@ -10,30 +10,30 @@ describe Project do
@abilities << Ability
end
- describe :read do
- before do
- @p1.users_projects.create(:project => @p1, :user => @u1, :read => false)
- @p1.users_projects.create(:project => @p1, :user => @u2, :read => true)
+ describe :read do
+ before do
+ @p1.users_projects.create(:project => @p1, :user => @u1, :read => false)
+ @p1.users_projects.create(:project => @p1, :user => @u2, :read => true)
end
it { @abilities.allowed?(@u1, :read_project, @p1).should be_false }
it { @abilities.allowed?(@u2, :read_project, @p1).should be_true }
end
- describe :write do
- before do
- @p1.users_projects.create(:project => @p1, :user => @u1, :write => false)
- @p1.users_projects.create(:project => @p1, :user => @u2, :write => true)
+ describe :write do
+ before do
+ @p1.users_projects.create(:project => @p1, :user => @u1, :write => false)
+ @p1.users_projects.create(:project => @p1, :user => @u2, :write => true)
end
it { @abilities.allowed?(@u1, :write_project, @p1).should be_false }
it { @abilities.allowed?(@u2, :write_project, @p1).should be_true }
end
- describe :admin do
- before do
- @p1.users_projects.create(:project => @p1, :user => @u1, :admin => false)
- @p1.users_projects.create(:project => @p1, :user => @u2, :admin => true)
+ describe :admin do
+ before do
+ @p1.users_projects.create(:project => @p1, :user => @u1, :admin => false)
+ @p1.users_projects.create(:project => @p1, :user => @u2, :admin => true)
end
it { @abilities.allowed?(@u1, :admin_project, @p1).should be_false }
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 0c62743d8e8..7bce57e8bb1 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -40,20 +40,20 @@ describe Project do
should_not allow_value("gitosis-admin").for(:path)
end
- it "should return valid url to repo" do
+ it "should return valid url to repo" do
project = Project.new(:path => "somewhere")
project.url_to_repo.should == "git@localhost:somewhere.git"
end
- it "should return path to repo" do
+ it "should return path to repo" do
project = Project.new(:path => "somewhere")
project.path_to_repo.should == File.join(Rails.root, "tmp", "tests", "somewhere")
end
- describe :valid_repo? do
- it "should be valid repo" do
+ describe :valid_repo? do
+ it "should be valid repo" do
project = Factory :project
- project.valid_repo?.should be_true
+ project.valid_repo?.should be_true
end
it "should be invalid repo" do
@@ -62,43 +62,43 @@ describe Project do
end
end
- describe "Git methods" do
+ describe "Git methods" do
let(:project) { Factory :project }
- describe :repo do
- it "should return valid repo" do
+ describe :repo do
+ it "should return valid repo" do
project.repo.should be_kind_of(Grit::Repo)
end
- it "should return nil" do
+ it "should return nil" do
lambda { Project.new(:path => "invalid").repo }.should raise_error(Grit::NoSuchPathError)
end
- it "should return nil" do
+ 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
+ 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
+ it "should return valid commit" do
project.commit(ValidCommit::ID).should be_valid_commit
end
- it "should return nil" do
+ it "should return nil" do
project.commit("+123_4532530XYZ").should be_nil
end
end
- describe :tree do
- before do
+ describe :tree do
+ before do
@commit = project.commit(ValidCommit::ID)
end
- it "should raise error w/o arguments" do
+ it "should raise error w/o arguments" do
lambda { project.tree }.should raise_error
end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 32fb90a317c..d66b1c251f0 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -14,7 +14,7 @@ describe User do
it { should respond_to(:name) }
end
- it "should return valid identifier" do
+ it "should return valid identifier" do
user = User.new(:email => "test@mail.com")
user.identifier.should == "test_mail.com"
end
diff --git a/spec/models/users_project_spec.rb b/spec/models/users_project_spec.rb
index d6a4d02b6e2..c15391619c6 100644
--- a/spec/models/users_project_spec.rb
+++ b/spec/models/users_project_spec.rb
@@ -11,7 +11,7 @@ describe UsersProject do
it { should validate_presence_of(:project_id) }
end
- describe "Delegate methods" do
+ describe "Delegate methods" do
it { should respond_to(:user_name) }
it { should respond_to(:user_email) }
end