tb_core 1.0.2 → 1.1.0

data/spec/controllers/admin/user_sessions_controller_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe Admin::UserSessionsController do
+  before(:each) do
+    # activate_authlogic
+    # SpudUserSession.create(FactoryGirl.build(:spud_user))
+  end
+
+  describe :new do
+    it "should redirect to setup url if no users exist" do
+      get :new
+      response.should redirect_to(admin_setup_path)
+    end
+
+    it "should render login form if users do exist" do
+      u = FactoryGirl.create(:spud_user)
+      u.save
+      get :new
+      response.should be_success
+    end
+  end
+
+  describe :create do
+    it "should rerender form when login is invalid" do
+      post :create
+        response.should be_success
+    end
+    it "should redirect to admin root if login is valid" do
+      u = FactoryGirl.create(:spud_user,:login => "testuser")
+      u.save
+      user_session = {:login => "testuser", :password => "password"}
+      post :create, :spud_user_session => user_session
+      response.should redirect_to(admin_root_path)
+    end
+  end
+
+  describe :destroy do
+    it "should redirect to login after logout when no referer" do
+      activate_authlogic
+      SpudUserSession.create(FactoryGirl.build(:spud_user))
+      delete :destroy
+      response.should redirect_to(admin_login_path)
+    end
+    it "should redirect to the admin login page after logout" do
+        request.env["HTTP_REFERER"] = "/"
+        activate_authlogic
+      SpudUserSession.create(FactoryGirl.build(:spud_user))
+      delete :destroy
+      response.should redirect_to("/admin/login")
+    end
+  end
+end

data/spec/controllers/{spud/admin → admin}/users_controller_spec.rb

@@ -1,9 +1,12 @@
 require 'spec_helper'
 
-describe Spud::Admin::UsersController do
+describe Admin::UsersController do
   before(:each) do
     activate_authlogic
     @user = SpudUserSession.create(FactoryGirl.build(:spud_user, :super_admin => true))
+    @role = FactoryGirl.create(:spud_role)
+    Spud::Core.admin_applications += [{:name => 'Test', :key => :test}]
+    Spud::Core.permissions.push(SpudPermission.new('admin.test.full_access', 'Test', [:test]))
   end
   
   describe :index do
@@ -29,27 +32,28 @@ describe Spud::Admin::UsersController do
     
     it "should allow access to users with the correct permissions" do
       u = FactoryGirl.create(:spud_user, :super_admin => false)
-      u.spud_admin_permissions << FactoryGirl.build(:spud_admin_permission, :name => "Users", :access => true)
+      @role.permission_tags = ['admin.users.full_access']
+      @role.save()
+      u.role = @role
       SpudUserSession.create(u)
       get :index
       
       response.should be_success
     end
 
-    it "should not allow access to users without permission and redirect to root_url if the user has no permissions" do
+    it "should not allow access to users without a role, and redirect to root_url if the user has no permissions" do
       u = FactoryGirl.create(:spud_user, :super_admin => false)
-      u.spud_admin_permissions << []
+      u.role = nil
       SpudUserSession.create(u)
       get :index
       
       response.should redirect_to(root_url)
     end
 
-    it "should not allow access to users without permission and redirect to root_url if the users has no other admin modules" do
+    it "should not allow access to users with a role that contains no permissions, and redirect to root_url if the users has no other admin modules" do
       u = FactoryGirl.create(:spud_user, :super_admin => false)
-      u.spud_admin_permissions << [
-        FactoryGirl.build(:spud_admin_permission, :name => "Users", :access => false)
-      ]
+      u.role = @role
+      @role.spud_role_permissions = []
       SpudUserSession.create(u)
       get :index
       
@@ -58,14 +62,12 @@ describe Spud::Admin::UsersController do
     
     it "should not allow access to users without permission and redirect to admin_root if the users has other admin modules" do
       u = FactoryGirl.create(:spud_user, :super_admin => false)
-      u.spud_admin_permissions << [
-        FactoryGirl.build(:spud_admin_permission, :name => "Users", :access => false),
-        FactoryGirl.build(:spud_admin_permission, :name => "App2", :access => true)
-      ]
+      @role.permission_tags = ['admin.test.full_access']
+      u.role = @role
       SpudUserSession.create(u)
       get :index
       
-      response.should redirect_to(spud_admin_root_url)
+      response.should redirect_to(admin_root_path)
     end
   end
   
@@ -105,33 +107,15 @@ describe Spud::Admin::UsersController do
         lambda {
           post :create, :spud_user => FactoryGirl.attributes_for(:spud_user)
         }.should change(SpudUser, :count).by(1)
-        response.should be_redirect
-      end
-    
-      it "should not create a user with an invalid form entry" do
-        lambda {
-          post :create, :spud_user => FactoryGirl.attributes_for(:spud_user, :email => nil)
-        }.should_not change(SpudUser, :count)
-        flash[:error].should_not be_blank
-      end
-    end
-    
-    context "JS format" do
-      it "should create a new user with a valid form submission" do
-        lambda {
-          post :create, :spud_user => FactoryGirl.attributes_for(:spud_user), :format => :js
-        }.should change(SpudUser, :count).by(1)
         response.should be_success
       end
     
       it "should not create a user with an invalid form entry" do
         lambda {
-          post :create, :spud_user => FactoryGirl.attributes_for(:spud_user, :email => nil), :format => :js
+          post :create, :spud_user => FactoryGirl.attributes_for(:spud_user, :email => nil)
         }.should_not change(SpudUser, :count)
-        response.should_not be_success
       end
-      
-    end
+    end    
   end
   
   describe :edit do
@@ -166,11 +150,11 @@ describe Spud::Admin::UsersController do
       }.should change(user, :first_name).to(new_name)
     end
     
-    it "should redirect to the admin users after a successful update" do
+    it "should redirect to the admin users show view after a successful update" do
       user = FactoryGirl.create(:spud_user)
       put :update, :id => user.id, :spud_user => user.attributes.merge!(:first_name => "Adam")
       
-      response.should redirect_to(spud_admin_users_url)
+      response.should redirect_to(admin_user_path(user))
     end
   end
   

data/spec/controllers/{spud/sitemap_controllers_spec.rb → sitemap_controllers_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spud::SitemapsController do
+describe SitemapsController do
   describe :show do
     it "should return the sitemap urls" do
       Spud::Core.sitemap_urls = [

data/spec/dummy/config/database.yml

@@ -5,11 +5,11 @@
 #   gem 'sqlite3'
 development:
   adapter: mysql2
-  database: spud_core_development
+  database: tb_core_development
   username: root
   
 test:
   adapter: mysql2
-  database: spud_core_test
+  database: tb_core_test
   username: root
 

data/spec/dummy/db/schema.rb

@@ -11,15 +11,31 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120329174000) do
+ActiveRecord::Schema.define(:version => 20130620163144) do
 
-  create_table "spud_admin_permissions", :force => true do |t|
-    t.integer  "user_id"
+  create_table "spud_permissions", :force => true do |t|
+    t.string   "name",       :null => false
+    t.string   "tag",        :null => false
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  add_index "spud_permissions", ["tag"], :name => "index_spud_permissions_on_tag", :unique => true
+
+  create_table "spud_role_permissions", :force => true do |t|
+    t.integer  "spud_role_id",        :null => false
+    t.string   "spud_permission_tag", :null => false
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+  end
+
+  add_index "spud_role_permissions", ["spud_permission_tag"], :name => "index_spud_role_permissions_on_spud_permission_tag"
+  add_index "spud_role_permissions", ["spud_role_id"], :name => "index_spud_role_permissions_on_spud_role_id"
+
+  create_table "spud_roles", :force => true do |t|
     t.string   "name"
-    t.boolean  "access"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
-    t.string   "scope"
   end
 
   create_table "spud_user_settings", :force => true do |t|
@@ -51,9 +67,11 @@ ActiveRecord::Schema.define(:version => 20120329174000) do
     t.datetime "created_at",                         :null => false
     t.datetime "updated_at",                         :null => false
     t.string   "time_zone"
+    t.integer  "spud_role_id"
   end
 
   add_index "spud_users", ["email"], :name => "index_spud_users_on_email"
   add_index "spud_users", ["login"], :name => "index_spud_users_on_login"
+  add_index "spud_users", ["spud_role_id"], :name => "index_spud_users_on_spud_role_id"
 
 end