From fa877b63126c84cb304228cf37b61d186d5e4477 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 17 Jun 2013 13:41:35 +0300 Subject: [PATCH] UsersGroup specs. Fixed db/schema --- app/models/users_group.rb | 4 +++- app/views/groups/people.html.haml | 2 +- db/schema.rb | 70 +++++++++++++++++++++++++++++++++------------------------------------- spec/factories/users_groups.rb | 8 +++----- spec/models/users_group_spec.rb | 24 +++++++++++++++++++++++- 5 files changed, 63 insertions(+), 45 deletions(-) diff --git a/app/models/users_group.rb b/app/models/users_group.rb index 999aeb2..146b788 100644 --- a/app/models/users_group.rb +++ b/app/models/users_group.rb @@ -15,7 +15,7 @@ class UsersGroup < ActiveRecord::Base } end - attr_accessible :group_access, :group_id, :user_id + attr_accessible :group_access, :user_id belongs_to :user belongs_to :project @@ -33,6 +33,8 @@ class UsersGroup < ActiveRecord::Base validates :user_id, presence: true validates :group_id, presence: true + delegate :name, :username, :email, to: :user, prefix: true + def human_group_access UsersGroup.group_access_roles.index(self.group_access) end diff --git a/app/views/groups/people.html.haml b/app/views/groups/people.html.haml index 857856d..965a761 100644 --- a/app/views/groups/people.html.haml +++ b/app/views/groups/people.html.haml @@ -6,7 +6,7 @@ = render (@project ? "new_member" : "new_group_member") .ui-box %h5.title - Team + #{@group.name} Team %small (#{@users_groups.count}) %ul.well-list diff --git a/db/schema.rb b/db/schema.rb index 8b13b08..415e972 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -53,8 +53,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do t.integer "assignee_id" t.integer "author_id" t.integer "project_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.integer "position", :default => 0 t.string "branch_name" t.text "description" @@ -71,8 +71,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do create_table "keys", :force => true do |t| t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.text "key" t.string "title" t.string "identifier" @@ -89,8 +89,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do t.integer "author_id" t.integer "assignee_id" t.string "title" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.text "st_commits", :limit => 2147483647 t.text "st_diffs", :limit => 2147483647 t.integer "milestone_id" @@ -139,8 +139,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do t.text "note" t.string "noteable_type" t.integer "author_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.integer "project_id" t.string "attachment" t.string "line_code" @@ -158,8 +158,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do t.string "name" t.string "path" t.text "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.integer "creator_id" t.string "default_branch" t.boolean "issues_enabled", :default => true, :null => false @@ -206,8 +206,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do t.text "content" t.integer "author_id", :null => false t.integer "project_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.string "file_name" t.datetime "expires_at" t.boolean "private", :default => true, :null => false @@ -228,9 +228,6 @@ ActiveRecord::Schema.define(:version => 20130617095603) do t.datetime "created_at" end - add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id" - add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context" - create_table "tags", :force => true do |t| t.string "name" end @@ -262,50 +259,49 @@ ActiveRecord::Schema.define(:version => 20130617095603) do end create_table "users", :force => true do |t| - t.string "email", :default => "", :null => false - t.string "encrypted_password", :default => "", :null => false + t.string "email", :default => "", :null => false + t.string "encrypted_password", :limit => 128, :default => "", :null => false t.string "reset_password_token" t.datetime "reset_password_sent_at" t.datetime "remember_created_at" - t.integer "sign_in_count", :default => 0 + t.integer "sign_in_count", :default => 0 t.datetime "current_sign_in_at" t.datetime "last_sign_in_at" t.string "current_sign_in_ip" t.string "last_sign_in_ip" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.string "name" - t.boolean "admin", :default => false, :null => false - t.integer "projects_limit", :default => 10 - t.string "skype", :default => "", :null => false - t.string "linkedin", :default => "", :null => false - t.string "twitter", :default => "", :null => false + t.boolean "admin", :default => false, :null => false + t.integer "projects_limit", :default => 10 + t.string "skype", :default => "", :null => false + t.string "linkedin", :default => "", :null => false + t.string "twitter", :default => "", :null => false t.string "authentication_token" - t.integer "theme_id", :default => 1, :null => false + t.integer "theme_id", :default => 1, :null => false t.string "bio" - t.integer "failed_attempts", :default => 0 + t.integer "failed_attempts", :default => 0 t.datetime "locked_at" t.string "extern_uid" t.string "provider" t.string "username" - t.boolean "can_create_group", :default => true, :null => false - t.boolean "can_create_team", :default => true, :null => false + t.boolean "can_create_group", :default => true, :null => false + t.boolean "can_create_team", :default => true, :null => false t.string "state" - t.integer "color_scheme_id", :default => 1, :null => false - t.integer "notification_level", :default => 1, :null => false + t.integer "color_scheme_id", :default => 1, :null => false + t.integer "notification_level", :default => 1, :null => false t.datetime "password_expires_at" t.integer "created_by_id" end add_index "users", ["admin"], :name => "index_users_on_admin" add_index "users", ["email"], :name => "index_users_on_email", :unique => true - add_index "users", ["extern_uid", "provider"], :name => "index_users_on_extern_uid_and_provider", :unique => true add_index "users", ["name"], :name => "index_users_on_name" add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true add_index "users", ["username"], :name => "index_users_on_username" create_table "users_groups", :force => true do |t| - t.integer "access_level", :null => false + t.integer "group_access", :null => false t.integer "group_id", :null => false t.integer "user_id", :null => false t.datetime "created_at", :null => false @@ -315,8 +311,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do create_table "users_projects", :force => true do |t| t.integer "user_id", :null => false t.integer "project_id", :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.integer "project_access", :default => 0, :null => false t.integer "notification_level", :default => 3, :null => false end @@ -328,8 +324,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do create_table "web_hooks", :force => true do |t| t.string "url" t.integer "project_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.string "type", :default => "ProjectHook" t.integer "service_id" end diff --git a/spec/factories/users_groups.rb b/spec/factories/users_groups.rb index f19f5d1..cb272e3 100644 --- a/spec/factories/users_groups.rb +++ b/spec/factories/users_groups.rb @@ -1,9 +1,7 @@ -# Read about factories at https://github.com/thoughtbot/factory_girl - FactoryGirl.define do factory :users_group do - access_level 1 - group_id 1 - user_id 1 + group_access { UsersGroup::OWNER } + group + user end end diff --git a/spec/models/users_group_spec.rb b/spec/models/users_group_spec.rb index e0c1d23..fd847da 100644 --- a/spec/models/users_group_spec.rb +++ b/spec/models/users_group_spec.rb @@ -1,5 +1,27 @@ require 'spec_helper' describe UsersGroup do - pending "add some examples to (or delete) #{__FILE__}" + describe "Associations" do + it { should belong_to(:group) } + it { should belong_to(:user) } + end + + describe "Mass assignment" do + it { should_not allow_mass_assignment_of(:group_id) } + end + + describe "Validation" do + let!(:users_group) { create(:users_group) } + + it { should validate_presence_of(:user) } + it { should validate_uniqueness_of(:user_id).scoped_to(:group_id).with_message(/already exists/) } + + it { should validate_presence_of(:group) } + it { should ensure_inclusion_of(:group_access).in_array(UsersGroup.group_access_roles.values) } + end + + describe "Delegate methods" do + it { should respond_to(:user_name) } + it { should respond_to(:user_email) } + end end -- libgit2 0.21.2