odania_core 0.0.4 → 0.0.5

data/test/factories/odania_user_roles.rb

@@ -0,0 +1,8 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+	factory :user_role, :class => 'Odania::UserRole' do
+		user
+		role 1
+	end
+end

data/test/factories/odania_users.rb

@@ -4,5 +4,9 @@ FactoryGirl.define do
 	factory :user, :class => 'Odania::User' do
 		sequence(:name) { |n| "User#{n}" }
 		sequence(:email) { |n| "mail#{n}@example.com" }
+
+		after(:create) do |user, evaluator|
+			create_list(:user_role, 1, user: user)
+		end
 	end
 end

data/test/support/test_setup.rb

@@ -6,6 +6,12 @@ module OdaniaTestMock
 
 	def self.current_user
 		@@mock_current_user ||= Odania::User.find_or_create_by(name: 'Admin', email: 'mail@example.com')
+
+		if @@mock_current_user.roles.count == 0
+			@@mock_current_user.roles.create(role: Odania::UserRole.roles[:admin])
+		end
+
+		return @@mock_current_user
 	end
 
 	mattr_accessor :user_authenticated

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odania_core
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Mike Petersen
@@ -264,6 +264,7 @@ files:
 - app/models/odania/tag_xref.rb
 - app/models/odania/target_type.rb
 - app/models/odania/user.rb
+- app/models/odania/user_role.rb
 - app/views/admin/dashboard/index.html.erb
 - app/views/admin/odania/contents/_choose_content.html.erb
 - app/views/admin/odania/contents/_choose_content_list.html.erb
@@ -330,9 +331,8 @@ files:
 - db/migrate/20140313225265_create_user.rb
 - db/migrate/20140323201042_create_odania_tags.rb
 - db/migrate/20140323201249_create_odania_tag_xrefs.rb
-- db/migrate/20140413151353_add_current_menu_item_to_content.rb
-- db/migrate/20140425164032_remove_menu_item_from_content.rb
-- db/migrate/20140425190306_add_language_to_tag.rb
+- db/migrate/20140425195051_create_odania_user_roles.rb
+- db/migrate/20140425202800_add_site_id_to_user.rb
 - db/seeds.rb
 - lib/odania.rb
 - lib/odania/admin.rb
@@ -7819,13 +7819,13 @@ files:
 - test/dummy/tmp/cache/assets/test/sprockets/ffb4e3c08cd390e6c34ecb8986a80042
 - test/dummy/tmp/cache/assets/test/sprockets/ffb88b74367cc52503ed6c38dcc55576
 - test/dummy/tmp/cache/assets/test/sprockets/ffe28ecf6034094189c88aa8d34d995c
-- test/dummy/tmp/pids/server.pid
 - test/factories/contents.rb
 - test/factories/languages.rb
 - test/factories/menu_items.rb
 - test/factories/menus.rb
 - test/factories/odania_tag_xrefs.rb
 - test/factories/odania_tags.rb
+- test/factories/odania_user_roles.rb
 - test/factories/odania_users.rb
 - test/factories/sites.rb
 - test/integration/helper_test.rb
@@ -15319,7 +15319,6 @@ test_files:
 - test/dummy/tmp/cache/assets/test/sprockets/b6a2fa0f3219d0551f8eddcb3fde524d
 - test/dummy/tmp/cache/assets/test/sprockets/5a87c17b3c5e6209890da9d8fea08911
 - test/dummy/tmp/cache/24C/7A1/views%2Flvh.me%3A3000%2Fde%2Fm1%2Ff188e6e90cf2009ed49591a40fdd2329
-- test/dummy/tmp/pids/server.pid
 - test/dummy/db/test.sqlite3
 - test/dummy/db/production.sqlite3
 - test/dummy/db/schema.rb
@@ -15343,6 +15342,7 @@ test_files:
 - test/integration/helper_test.rb
 - test/integration/menu_route_test.rb
 - test/factories/contents.rb
+- test/factories/odania_user_roles.rb
 - test/factories/odania_users.rb
 - test/factories/languages.rb
 - test/factories/odania_tag_xrefs.rb

data/db/migrate/20140413151353_add_current_menu_item_to_content.rb

@@ -1,5 +0,0 @@
-class AddCurrentMenuItemToContent < ActiveRecord::Migration
-	def change
-		add_column :odania_contents, :current_menu_item_id, :integer
-	end
-end

data/db/migrate/20140425164032_remove_menu_item_from_content.rb

@@ -1,6 +0,0 @@
-class RemoveMenuItemFromContent < ActiveRecord::Migration
-	def change
-		remove_column :odania_contents, :menu_item_id
-		remove_column :odania_contents, :current_menu_item_id
-	end
-end

data/db/migrate/20140425190306_add_language_to_tag.rb

@@ -1,5 +0,0 @@
-class AddLanguageToTag < ActiveRecord::Migration
-	def change
-		add_column :odania_tags, :language_id, :integer
-	end
-end

data/test/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-20209