fix User spec indention

1 files changed, 36 insertions, 30 deletions

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 5e6e41a..cf88645 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,39 +1,45 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe User do
-	before(:each) do
-		@admin = users(:admin)
-		@other_user = users(:developer)
-	end
+  before(:each) do
+    @admin = users(:admin)
+    @other_user = users(:developer)
+  end
 
   it "should be administrator" do
-		@admin.should be_administrator
+    @admin.should be_administrator
+  end
+
+  [:guest, :developer, :council_member].each do |role|
+    it "with role #{role} should not be administrator" do
+      users(role).should_not be_administrator
+    end
+  end
+
+  it "should be able to become administrator" do
+    # make sure user is not admin before the test
+    @other_user.should_not be_administrator
+    @other_user.role = :admin
+    @other_user.should be_valid
+    @other_user.should be_administrator
   end
 
-	it "should not be administrator" do
-		@other_user.should_not be_administrator
-	end
-
-	it "should be able to become administrator" do
-		@other_user.role = :admin
-		@other_user.should be_valid
-		@other_user.should be_administrator
-	end
-
-	it "should reject invalid role" do
-		@other_user.role = :fake_role
-		@other_user.should_not be_valid
-	end
-
-	it "role should be updatable by administrator" do
-		@other_user.should be_updatable_by(@admin)
-	end
-
-	[:council_member, :guest].each do |role|
-		it "should not be updatable by a user with role #{role}" do
-			@other_user.role = role
-			@other_user.should_not be_updatable_by(@other_user)
-		end
-	end
+  it "should reject invalid role" do
+    @other_user.role = :fake_role
+    @other_user.should_not be_valid
+  end
+
+  it "role should be updatable by administrator" do
+    # make sure old and new roles are different
+    @other_user.role.to_sym.should_not == :guest
+    @other_user.role = :guest
+    @other_user.should be_updatable_by(@admin)
+  end
+
+  [:council_member, :guest].each do |role|
+    it "should not be updatable by a user with role #{role}" do
+      @other_user.should_not be_updatable_by(users(role))
+    end
+  end
 
 end