tb_core 1.0 → 1.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (26) hide show
  1. checksums.yaml +8 -8
  2. data/app/controllers/spud/admin/application_controller.rb +2 -2
  3. data/app/controllers/spud/{password_resets_controller.rb → admin/password_resets_controller.rb} +13 -11
  4. data/app/controllers/spud/admin/settings_controller.rb +27 -0
  5. data/app/controllers/spud/{user_sessions_controller.rb → admin/user_sessions_controller.rb} +13 -7
  6. data/app/controllers/spud/application_controller.rb +61 -61
  7. data/app/controllers/spud/setup_controller.rb +2 -2
  8. data/app/mailers/spud/core_mailer.rb +1 -1
  9. data/app/views/layouts/spud/admin/application.html.erb +3 -2
  10. data/app/views/spud/{password_resets/new.html.erb → admin/password_resets/index.html.erb} +1 -1
  11. data/app/views/spud/{password_resets/edit.html.erb → admin/password_resets/show.html.erb} +3 -3
  12. data/app/views/spud/{users → admin/settings}/_form.html.erb +1 -1
  13. data/app/views/spud/admin/settings/edit.html.erb +8 -0
  14. data/app/views/spud/{user_sessions → admin/user_sessions}/new.html.erb +3 -3
  15. data/config/routes.rb +24 -15
  16. data/lib/spud_core/configuration.rb +6 -1
  17. data/lib/spud_core/version.rb +1 -1
  18. data/spec/controllers/spud/admin/application_controller_spec.rb +1 -1
  19. data/spec/controllers/spud/{password_reset_controller_spec.rb → admin/password_reset_controller_spec.rb} +11 -11
  20. data/spec/controllers/spud/{users_controller_spec.rb → admin/settings_controller_spec.rb} +5 -19
  21. data/spec/controllers/spud/{user_sessions_controller_spec.rb → admin/user_sessions_controller_spec.rb} +7 -7
  22. data/spec/controllers/spud/setup_controller_spec.rb +2 -2
  23. data/spec/dummy/log/test.log +34192 -0
  24. metadata +16 -16
  25. data/app/controllers/spud/users_controller.rb +0 -45
  26. data/app/views/spud/users/settings.html.erb +0 -12
@@ -1,5 +1,5 @@
1
1
  require 'spec_helper'
2
- describe Spud::UserSessionsController do
2
+ describe Spud::Admin::UserSessionsController do
3
3
  before(:each) do
4
4
  # activate_authlogic
5
5
  # SpudUserSession.create(FactoryGirl.build(:spud_user))
@@ -8,14 +8,14 @@ describe Spud::UserSessionsController do
8
8
  describe :new do
9
9
  it "should redirect to setup url if no users exist" do
10
10
  get :new
11
- response.should redirect_to(spud_setup_url)
11
+ response.should redirect_to(spud_setup_url)
12
12
  end
13
13
 
14
14
  it "should render login form if users do exist" do
15
15
  u = FactoryGirl.create(:spud_user)
16
16
  u.save
17
17
  get :new
18
- response.should be_success
18
+ response.should be_success
19
19
  end
20
20
  end
21
21
 
@@ -24,12 +24,12 @@ describe Spud::UserSessionsController do
24
24
  post :create
25
25
  response.should be_success
26
26
  end
27
- it "should redirect to root url if login is valid" do
27
+ it "should redirect to admin root if login is valid" do
28
28
  u = FactoryGirl.create(:spud_user,:login => "testuser")
29
29
  u.save
30
30
  user_session = {:login => "testuser", :password => "password"}
31
- post :create,:spud_user_session => user_session
32
- response.should redirect_to(root_url)
31
+ post :create, :spud_user_session => user_session
32
+ response.should redirect_to(spud_admin_root_path)
33
33
  end
34
34
  end
35
35
 
@@ -38,7 +38,7 @@ describe Spud::UserSessionsController do
38
38
  activate_authlogic
39
39
  SpudUserSession.create(FactoryGirl.build(:spud_user))
40
40
  delete :destroy
41
- response.should redirect_to(new_spud_user_session_url)
41
+ response.should redirect_to(spud_admin_login_path)
42
42
  end
43
43
  it "should redirect to previous page after logout" do
44
44
  request.env["HTTP_REFERER"] = "/"
@@ -32,7 +32,7 @@ describe Spud::SetupController do
32
32
  SpudUser.stubs(:count).returns(1)
33
33
  get :index
34
34
 
35
- response.should redirect_to(new_spud_user_session_url)
35
+ response.should redirect_to(spud_admin_login_path)
36
36
  end
37
37
 
38
38
  it "should create a new user" do
@@ -44,7 +44,7 @@ describe Spud::SetupController do
44
44
  it "should redirect to the admin login form when first admin user has been created" do
45
45
  post :index, FactoryGirl.attributes_for(:spud_user)
46
46
 
47
- response.should redirect_to(new_spud_user_session_url)
47
+ response.should redirect_to(spud_admin_login_path)
48
48
  end
49
49
 
50
50
  it "should display an error if the user is invalid" do