Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNihad Abbasov <narkoz.2008@gmail.com>2011-10-26 17:46:25 +0400
committerNihad Abbasov <narkoz.2008@gmail.com>2011-10-26 17:46:25 +0400
commitd62200cad430565bd9f80befaf329297120330b5 (patch)
tree6217dd41e6f86e657513b509ed7a3f2bfdfa70ab /spec/requests/admin/admin_users_spec.rb
parentf6a67fbad5119e3d95e33cfd4f4e4992707d5ba0 (diff)
clean-up code
* Remove trailing whitespace * Converts hard-tabs into two-space soft-tabs * Remove consecutive blank lines
Diffstat (limited to 'spec/requests/admin/admin_users_spec.rb')
-rw-r--r--spec/requests/admin/admin_users_spec.rb34
1 files changed, 17 insertions, 17 deletions
diff --git a/spec/requests/admin/admin_users_spec.rb b/spec/requests/admin/admin_users_spec.rb
index 8d9cbcae2ac..67cfde5faf4 100644
--- a/spec/requests/admin/admin_users_spec.rb
+++ b/spec/requests/admin/admin_users_spec.rb
@@ -4,7 +4,7 @@ describe "Admin::Users" do
before { login_as :admin }
describe "GET /admin/users" do
- before do
+ before do
visit admin_users_path
end
@@ -12,14 +12,14 @@ describe "Admin::Users" do
current_path.should == admin_users_path
end
- it "should have users list" do
+ it "should have users list" do
page.should have_content(@user.email)
page.should have_content(@user.name)
end
end
- describe "GET /admin/users/new" do
- before do
+ describe "GET /admin/users/new" do
+ before do
@password = "123ABC"
visit new_admin_user_path
fill_in "user_name", :with => "Big Bang"
@@ -28,23 +28,23 @@ describe "Admin::Users" do
fill_in "user_password_confirmation", :with => @password
end
- it "should create new user" do
+ it "should create new user" do
expect { click_button "Save" }.to change {User.count}.by(1)
end
- it "should create user with valid data" do
+ it "should create user with valid data" do
click_button "Save"
user = User.last
user.name.should == "Big Bang"
user.email.should == "bigbang@mail.com"
end
- it "should call send mail" do
+ it "should call send mail" do
Notify.should_receive(:new_user_email).and_return(stub(:deliver => true))
click_button "Save"
end
- it "should send valid email to user with email & password" do
+ it "should send valid email to user with email & password" do
click_button "Save"
user = User.last
email = ActionMailer::Base.deliveries.last
@@ -54,45 +54,45 @@ describe "Admin::Users" do
end
end
- describe "GET /admin/users/:id" do
- before do
+ describe "GET /admin/users/:id" do
+ before do
visit admin_users_path
click_link "Show"
end
- it "should have user info" do
+ it "should have user info" do
page.should have_content(@user.email)
page.should have_content(@user.name)
page.should have_content(@user.is_admin?)
end
end
- describe "GET /admin/users/:id/edit" do
- before do
+ describe "GET /admin/users/:id/edit" do
+ before do
@simple_user = Factory :user
visit admin_users_path
click_link "edit_user_#{@simple_user.id}"
end
- it "should have user edit page" do
+ it "should have user edit page" do
page.should have_content("Name")
page.should have_content("Password")
end
describe "Update user" do
- before do
+ before do
fill_in "user_name", :with => "Big Bang"
fill_in "user_email", :with => "bigbang@mail.com"
check "user_admin"
click_button "Save"
end
- it "should show page with new data" do
+ it "should show page with new data" do
page.should have_content("bigbang@mail.com")
page.should have_content("Big Bang")
end
- it "should change user entry" do
+ it "should change user entry" do
@simple_user.reload
@simple_user.name.should == "Big Bang"
@simple_user.is_admin?.should be_true