From a23689a6aa738f5dd051d65b9e26e5d6bb7fa332 Mon Sep 17 00:00:00 2001 From: Jamie Winsor Date: Thu, 4 Aug 2011 03:11:56 -0700 Subject: Remove shared functionality that now exists in refinerycms-testing engine --- features/support/env.rb | 5 +- lib/gemspec.rb | 5 +- refinerycms-blog.gemspec | 472 +++++++++++++++++++++++++++++++++++++++++++---- spec/factories/user.rb | 27 --- spec/spec_helper.rb | 6 +- 5 files changed, 451 insertions(+), 64 deletions(-) delete mode 100644 spec/factories/user.rb diff --git a/features/support/env.rb b/features/support/env.rb index a84d601..4bc2cc2 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -8,10 +8,11 @@ Spork.prefork do require 'capybara/cucumber' require 'capybara/session' - require 'factory_girl' + require 'refinery/testing/factories' + require 'database_cleaner' require 'database_cleaner/cucumber' - + Dir[File.expand_path("../../../spec/factories/*.rb", __FILE__)].each {|f| require f} include ::Devise::Controllers::UrlHelpers diff --git a/lib/gemspec.rb b/lib/gemspec.rb index 60c9671..5627a98 100644 --- a/lib/gemspec.rb +++ b/lib/gemspec.rb @@ -5,6 +5,9 @@ raise "Could not get version so gemspec can not be built" if version.nil? files = Dir.glob("**/*").flatten.reject{|f| f =~ %r{.gem$}} gemspec = < 1.1.0' # Development dependencies - s.add_development_dependency 'factory_girl' + s.add_development_dependency 'refinerycms-testing', '~> 1.1.0' s.files = %w( #{files.join("\n ")} diff --git a/refinerycms-blog.gemspec b/refinerycms-blog.gemspec index 9857e66..2c65de2 100644 --- a/refinerycms-blog.gemspec +++ b/refinerycms-blog.gemspec @@ -1,8 +1,11 @@ +# Encoding: UTF-8 +# DO NOT EDIT THIS FILE DIRECTLY! Instead, use lib/gemspec.rb to generate it. + Gem::Specification.new do |s| s.name = %q{refinerycms-blog} s.version = %q{2.0.0} s.description = %q{A really straightforward open source Ruby on Rails blog engine designed for integration with RefineryCMS.} - s.date = %q{2011-08-03} + s.date = %q{2011-08-04} s.summary = %q{Ruby on Rails blogging engine for RefineryCMS.} s.email = %q{info@refinerycms.com} s.homepage = %q{http://refinerycms.com/blog} @@ -17,20 +20,6 @@ Gem::Specification.new do |s| # Development dependencies s.add_development_dependency 'refinerycms-testing', '~> 1.1.0' - s.add_development_dependency 'rake', '~> 0.9.2' - s.add_development_dependency 'rails', '3.1.0.rc5' - s.add_development_dependency 'factory_girl' - s.add_development_dependency 'sqlite3' - s.add_development_dependency 'rspec' - s.add_development_dependency 'rspec-rails', '2.6.1.beta1' - s.add_development_dependency 'capybara' - s.add_development_dependency 'cucumber-rails' - s.add_development_dependency 'spork', '0.9.0.rc9' - s.add_development_dependency 'guard-spork' - s.add_development_dependency 'guard-rspec' - s.add_development_dependency 'guard-cucumber' - s.add_development_dependency 'rb-fsevent' - s.add_development_dependency 'database_cleaner' s.files = %w( app @@ -53,11 +42,13 @@ Gem::Specification.new do |s| app/assets/images/refinery/blog/icons/page_copy.png app/assets/images/refinery/blog/icons/up.gif app/assets/images/refinery/blog/rss-feed.png + app/assets/images/refinerycms-blog app/assets/javascripts app/assets/javascripts/refinery app/assets/javascripts/refinery/blog app/assets/javascripts/refinery/blog/backend.js app/assets/javascripts/refinery/blog/frontend.js + app/assets/javascripts/refinerycms-blog app/assets/stylesheets app/assets/stylesheets/refinery app/assets/stylesheets/refinery/blog @@ -80,6 +71,7 @@ Gem::Specification.new do |s| app/assets/stylesheets/refinery/blog/ui-lightness/images/ui-icons_ffd27a_256x240.png app/assets/stylesheets/refinery/blog/ui-lightness/images/ui-icons_ffffff_256x240.png app/assets/stylesheets/refinery/blog/ui-lightness/jquery-ui-1.8.13.custom.css.scss + app/assets/stylesheets/refinerycms-blog app/controllers app/controllers/refinery app/controllers/refinery/admin @@ -165,6 +157,8 @@ Gem::Specification.new do |s| app/views/refinery/shared/admin/_autocomplete.html.erb changelog.md config + config/cucumber.yml + config/environment.rb config/locales config/locales/bg.yml config/locales/cs.yml @@ -184,52 +178,466 @@ Gem::Specification.new do |s| config/routes.rb db db/migrate - db/migrate/1_create_blog_structure.rb - db/migrate/2_add_user_id_to_blog_posts.rb - db/migrate/3_acts_as_taggable_on_migration.rb - db/migrate/4_create_seo_meta_for_blog.rb - db/migrate/5_add_cached_slugs.rb - db/migrate/6_add_custom_url_field_to_blog_posts.rb - db/migrate/7_add_custom_teaser_field_to_blog_posts.rb - db/migrate/8_add_primary_key_to_categorizations.rb + db/migrate/20110803223522_create_blog_structure.rb + db/migrate/20110803223523_add_user_id_to_blog_posts.rb + db/migrate/20110803223524_acts_as_taggable_on_migration.rb + db/migrate/20110803223525_create_seo_meta_for_blog.rb + db/migrate/20110803223526_add_cached_slugs.rb + db/migrate/20110803223527_add_custom_url_field_to_blog_posts.rb + db/migrate/20110803223528_add_custom_teaser_field_to_blog_posts.rb + db/migrate/20110803223529_add_primary_key_to_categorizations.rb db/seeds db/seeds/refinerycms_blog.rb features features/authors.feature features/category.feature + features/step_definitions + features/step_definitions/authors_steps.rb + features/step_definitions/category_steps.rb + features/step_definitions/tags_steps.rb + features/step_definitions/user_steps.rb + features/step_definitions/web_steps.rb features/support - features/support/factories - features/support/factories/blog_categories.rb - features/support/factories/blog_comments.rb - features/support/factories/blog_posts.rb + features/support/env.rb features/support/paths.rb - features/support/step_definitions - features/support/step_definitions/authors_steps.rb - features/support/step_definitions/category_steps.rb - features/support/step_definitions/tags_steps.rb + features/support/selectors.rb features/tags.feature + Gemfile + Gemfile.lock + Guardfile lib lib/gemspec.rb lib/generators lib/generators/blog_generator.rb lib/refinery lib/refinery/blog + lib/refinery/blog/engine.rb lib/refinery/blog/tabs.rb lib/refinery/blog/version.rb lib/refinerycms-blog.rb - public + Rakefile readme.md refinerycms-blog.gemspec + script + script/cucumber + script/rails spec + spec/dummy + spec/dummy/app + spec/dummy/app/assets + spec/dummy/app/assets/javascripts + spec/dummy/app/assets/javascripts/admin.js + spec/dummy/app/assets/javascripts/application.js + spec/dummy/app/assets/stylesheets + spec/dummy/app/assets/stylesheets/application.css + spec/dummy/app/assets/stylesheets/application.css.backup + spec/dummy/app/assets/stylesheets/formatting.css + spec/dummy/app/assets/stylesheets/home.css + spec/dummy/app/assets/stylesheets/theme.css + spec/dummy/app/controllers + spec/dummy/app/controllers/application_controller.rb + spec/dummy/app/helpers + spec/dummy/app/helpers/application_helper.rb + spec/dummy/app/mailers + spec/dummy/app/models + spec/dummy/app/views + spec/dummy/app/views/layouts + spec/dummy/app/views/layouts/application.html.erb.backup + spec/dummy/app/views/sitemap + spec/dummy/app/views/sitemap/index.xml.builder + spec/dummy/config + spec/dummy/config/application.rb + spec/dummy/config/boot.rb + spec/dummy/config/database.yml + spec/dummy/config/database.yml.mysql + spec/dummy/config/database.yml.postgresql + spec/dummy/config/database.yml.sqlite3 + spec/dummy/config/environment.rb + spec/dummy/config/environments + spec/dummy/config/environments/development.rb + spec/dummy/config/environments/production.rb + spec/dummy/config/environments/test.rb + spec/dummy/config/initializers + spec/dummy/config/initializers/backtrace_silencers.rb + spec/dummy/config/initializers/devise.rb + spec/dummy/config/initializers/inflections.rb + spec/dummy/config/initializers/mime_types.rb + spec/dummy/config/initializers/secret_token.rb + spec/dummy/config/initializers/session_store.rb + spec/dummy/config/initializers/wrap_parameters.rb + spec/dummy/config/locales + spec/dummy/config/locales/en.yml + spec/dummy/config/routes.rb + spec/dummy/config.ru + spec/dummy/db + spec/dummy/db/development.sqlite3 + spec/dummy/db/migrate + spec/dummy/db/migrate/20110802081556_create_refinerycms_core_schema.rb + spec/dummy/db/migrate/20110802081557_add_locale_to_slugs.rb + spec/dummy/db/migrate/20110802081558_create_refinerycms_settings_schema.rb + spec/dummy/db/migrate/20110802081559_add_value_type_to_refinery_settings.rb + spec/dummy/db/migrate/20110802081560_create_refinerycms_authentication_schema.rb + spec/dummy/db/migrate/20110802081561_add_missing_indexes_to_roles_users.rb + spec/dummy/db/migrate/20110802081562_change_to_devise_users_table.rb + spec/dummy/db/migrate/20110802081563_add_remember_created_at_to_users.rb + spec/dummy/db/migrate/20110802081564_remove_password_salt_from_users.rb + spec/dummy/db/migrate/20110802081565_create_refinerycms_images_schema.rb + spec/dummy/db/migrate/20110802081566_create_refinerycms_pages_schema.rb + spec/dummy/db/migrate/20110802081567_translate_page_plugin.rb + spec/dummy/db/migrate/20110802081568_remove_cached_slug_from_pages.rb + spec/dummy/db/migrate/20110802081569_translate_custom_title_on_pages.rb + spec/dummy/db/migrate/20110802081570_remove_translated_fields_from_pages.rb + spec/dummy/db/migrate/20110802081571_create_seo_meta.rb + spec/dummy/db/migrate/20110802081572_create_add_template_columns.rb + spec/dummy/db/migrate/20110802081573_create_refinerycms_resources_schema.rb + spec/dummy/db/schema.rb + spec/dummy/db/seeds + spec/dummy/db/seeds/pages.rb + spec/dummy/db/seeds.rb + spec/dummy/db/test.sqlite3 + spec/dummy/index + spec/dummy/index/development + spec/dummy/index/development/Refinery::Page + spec/dummy/index/development/Refinery::Page/102_111_117.ind + spec/dummy/index/development/Refinery::Page/104_111_109.ind + spec/dummy/index/development/Refinery::Page/110_111_116.ind + spec/dummy/index/development/Refinery::Page/112_97_103.ind + spec/dummy/index/development/Refinery::Page/97_98_111.ind + spec/dummy/index/development/Refinery::Page/98_108_111.ind + spec/dummy/index/development/Refinery::Page/size + spec/dummy/index/development/Refinery::Page/version + spec/dummy/index/development/Refinery::Setting + spec/dummy/index/development/Refinery::Setting/100_101_102.ind + spec/dummy/index/development/Refinery::Setting/100_114_97.ind + spec/dummy/index/development/Refinery::Setting/102_114_111.ind + spec/dummy/index/development/Refinery::Setting/112_97_103.ind + spec/dummy/index/development/Refinery::Setting/115_105_116.ind + spec/dummy/index/development/Refinery::Setting/115_116_114.ind + spec/dummy/index/development/Refinery::Setting/116_101_97.ind + spec/dummy/index/development/Refinery::Setting/117_115_101.ind + spec/dummy/index/development/Refinery::Setting/97_110_97.ind + spec/dummy/index/development/Refinery::Setting/97_112_112.ind + spec/dummy/index/development/Refinery::Setting/97_117_116.ind + spec/dummy/index/development/Refinery::Setting/98_108_111.ind + spec/dummy/index/development/Refinery::Setting/99_111_109.ind + spec/dummy/index/development/Refinery::Setting/size + spec/dummy/index/development/Refinery::Setting/version + spec/dummy/index/test + spec/dummy/index/test/Refinery::Setting + spec/dummy/index/test/Refinery::Setting/100_114_97.ind + spec/dummy/index/test/Refinery::Setting/102_114_111.ind + spec/dummy/index/test/Refinery::Setting/112_97_103.ind + spec/dummy/index/test/Refinery::Setting/115_105_116.ind + spec/dummy/index/test/Refinery::Setting/115_116_114.ind + spec/dummy/index/test/Refinery::Setting/116_101_97.ind + spec/dummy/index/test/Refinery::Setting/117_115_101.ind + spec/dummy/index/test/Refinery::Setting/97_110_97.ind + spec/dummy/index/test/Refinery::Setting/97_112_112.ind + spec/dummy/index/test/Refinery::Setting/97_117_116.ind + spec/dummy/index/test/Refinery::Setting/98_108_111.ind + spec/dummy/index/test/Refinery::Setting/99_111_109.ind + spec/dummy/index/test/Refinery::Setting/size + spec/dummy/index/test/Refinery::Setting/version + spec/dummy/lib + spec/dummy/lib/assets + spec/dummy/log + spec/dummy/log/development.log + spec/dummy/log/test.log + spec/dummy/public + spec/dummy/public/404.html + spec/dummy/public/422.html + spec/dummy/public/500.html + spec/dummy/public/favicon.ico + spec/dummy/Rakefile + spec/dummy/README.md + spec/dummy/script + spec/dummy/script/rails + spec/dummy/tmp + spec/dummy/tmp/dragonfly + spec/dummy/tmp/dragonfly/cache + spec/dummy/tmp/dragonfly/cache/body + spec/dummy/tmp/dragonfly/cache/meta + spec/dummy/tmp/index + spec/dummy/tmp/index/development + spec/dummy/tmp/index/development/Refinery::BlogCategory + spec/dummy/tmp/index/development/Refinery::BlogCategory/103_97_109.ind + spec/dummy/tmp/index/development/Refinery::BlogCategory/115_104_111.ind + spec/dummy/tmp/index/development/Refinery::BlogCategory/118_105_100.ind + spec/dummy/tmp/index/development/Refinery::BlogCategory/49.ind + spec/dummy/tmp/index/development/Refinery::BlogCategory/49_48.ind + spec/dummy/tmp/index/development/Refinery::BlogCategory/49_49.ind + spec/dummy/tmp/index/development/Refinery::BlogCategory/49_50.ind + spec/dummy/tmp/index/development/Refinery::BlogCategory/50.ind + spec/dummy/tmp/index/development/Refinery::BlogCategory/51.ind + spec/dummy/tmp/index/development/Refinery::BlogCategory/52.ind + spec/dummy/tmp/index/development/Refinery::BlogCategory/53.ind + spec/dummy/tmp/index/development/Refinery::BlogCategory/54.ind + spec/dummy/tmp/index/development/Refinery::BlogCategory/55.ind + spec/dummy/tmp/index/development/Refinery::BlogCategory/56.ind + spec/dummy/tmp/index/development/Refinery::BlogCategory/57.ind + spec/dummy/tmp/index/development/Refinery::BlogCategory/size + spec/dummy/tmp/index/development/Refinery::BlogCategory/version + spec/dummy/tmp/index/development/Refinery::BlogComment + spec/dummy/tmp/index/development/Refinery::BlogComment/101_120_97.ind + spec/dummy/tmp/index/development/Refinery::BlogComment/102_111_114.ind + spec/dummy/tmp/index/development/Refinery::BlogComment/105_115.ind + spec/dummy/tmp/index/development/Refinery::BlogComment/106_111_101.ind + spec/dummy/tmp/index/development/Refinery::BlogComment/110_101_119.ind + spec/dummy/tmp/index/development/Refinery::BlogComment/111_110_101.ind + spec/dummy/tmp/index/development/Refinery::BlogComment/112_101_114.ind + spec/dummy/tmp/index/development/Refinery::BlogComment/112_105_99.ind + spec/dummy/tmp/index/development/Refinery::BlogComment/115_104_111.ind + spec/dummy/tmp/index/development/Refinery::BlogComment/116_104_101.ind + spec/dummy/tmp/index/development/Refinery::BlogComment/117_112.ind + spec/dummy/tmp/index/development/Refinery::BlogComment/119_104_105.ind + spec/dummy/tmp/index/development/Refinery::BlogComment/98_101_115.ind + spec/dummy/tmp/index/development/Refinery::BlogComment/99_111_109.ind + spec/dummy/tmp/index/development/Refinery::BlogComment/size + spec/dummy/tmp/index/development/Refinery::BlogComment/version + spec/dummy/tmp/index/development/Refinery::BlogPost + spec/dummy/tmp/index/development/Refinery::BlogPost/102_111_114.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/103_111_105.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/103_117_121.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/104_111_116.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/104_97_120.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/105_110.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/105_115.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/105_116.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/106_111_101.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/107_105_119.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/108_111_110.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/110_101_119.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/111_107_97.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/112.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/112_101_97.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/112_111_115.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/112_97_114.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/114_101.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/114_101_102.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/114_101_97.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/115_104_111.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/115_116_111.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/115_116_117.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/115_97_107.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/116_101_110.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/116_104_101.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/116_111.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/116_111_112.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/116_114_117.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/119_105_116.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/121_111_117.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/49.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/49_48.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/49_49.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/49_50.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/49_51.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/49_52.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/49_53.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/49_54.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/49_55.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/49_56.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/49_57.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/50.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/50_48.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/50_49.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/50_50.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/50_51.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/50_52.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/50_53.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/50_54.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/50_55.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/50_56.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/50_57.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/51.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/51_48.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/51_49.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/51_50.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/51_51.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/52.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/53.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/55.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/56.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/57.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/97.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/97_110_111.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/97_114_101.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/97_98_111.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/98_108_111.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/98_108_97.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/98_114_101.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/99_101_110.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/99_104_105.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/99_109_115.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/99_111_109.ind + spec/dummy/tmp/index/development/Refinery::BlogPost/size + spec/dummy/tmp/index/development/Refinery::BlogPost/version + spec/dummy/tmp/index/development/Refinery::Setting + spec/dummy/tmp/index/development/Refinery::Setting/102_114_111.ind + spec/dummy/tmp/index/development/Refinery::Setting/112_97_103.ind + spec/dummy/tmp/index/development/Refinery::Setting/115_104_97.ind + spec/dummy/tmp/index/development/Refinery::Setting/115_105_116.ind + spec/dummy/tmp/index/development/Refinery::Setting/115_116_114.ind + spec/dummy/tmp/index/development/Refinery::Setting/116_101_97.ind + spec/dummy/tmp/index/development/Refinery::Setting/117_115_101.ind + spec/dummy/tmp/index/development/Refinery::Setting/97_110_97.ind + spec/dummy/tmp/index/development/Refinery::Setting/97_112_112.ind + spec/dummy/tmp/index/development/Refinery::Setting/97_117_116.ind + spec/dummy/tmp/index/development/Refinery::Setting/98_108_111.ind + spec/dummy/tmp/index/development/Refinery::Setting/99_111_109.ind + spec/dummy/tmp/index/development/Refinery::Setting/99_97_99.ind + spec/dummy/tmp/index/development/Refinery::Setting/size + spec/dummy/tmp/index/development/Refinery::Setting/version + spec/dummy/tmp/index/test + spec/dummy/tmp/index/test/Refinery::BlogCategory + spec/dummy/tmp/index/test/Refinery::BlogCategory/103_97_109.ind + spec/dummy/tmp/index/test/Refinery::BlogCategory/115_104_111.ind + spec/dummy/tmp/index/test/Refinery::BlogCategory/118_105_100.ind + spec/dummy/tmp/index/test/Refinery::BlogCategory/49.ind + spec/dummy/tmp/index/test/Refinery::BlogCategory/49_48.ind + spec/dummy/tmp/index/test/Refinery::BlogCategory/49_49.ind + spec/dummy/tmp/index/test/Refinery::BlogCategory/49_50.ind + spec/dummy/tmp/index/test/Refinery::BlogCategory/49_51.ind + spec/dummy/tmp/index/test/Refinery::BlogCategory/50.ind + spec/dummy/tmp/index/test/Refinery::BlogCategory/51.ind + spec/dummy/tmp/index/test/Refinery::BlogCategory/52.ind + spec/dummy/tmp/index/test/Refinery::BlogCategory/53.ind + spec/dummy/tmp/index/test/Refinery::BlogCategory/54.ind + spec/dummy/tmp/index/test/Refinery::BlogCategory/55.ind + spec/dummy/tmp/index/test/Refinery::BlogCategory/56.ind + spec/dummy/tmp/index/test/Refinery::BlogCategory/57.ind + spec/dummy/tmp/index/test/Refinery::BlogCategory/size + spec/dummy/tmp/index/test/Refinery::BlogCategory/version + spec/dummy/tmp/index/test/Refinery::BlogComment + spec/dummy/tmp/index/test/Refinery::BlogComment/101_120_97.ind + spec/dummy/tmp/index/test/Refinery::BlogComment/102_111_114.ind + spec/dummy/tmp/index/test/Refinery::BlogComment/105_115.ind + spec/dummy/tmp/index/test/Refinery::BlogComment/106_111_101.ind + spec/dummy/tmp/index/test/Refinery::BlogComment/110_101_119.ind + spec/dummy/tmp/index/test/Refinery::BlogComment/111_110_101.ind + spec/dummy/tmp/index/test/Refinery::BlogComment/112_101_114.ind + spec/dummy/tmp/index/test/Refinery::BlogComment/112_105_99.ind + spec/dummy/tmp/index/test/Refinery::BlogComment/115_104_111.ind + spec/dummy/tmp/index/test/Refinery::BlogComment/116_104_101.ind + spec/dummy/tmp/index/test/Refinery::BlogComment/117_112.ind + spec/dummy/tmp/index/test/Refinery::BlogComment/119_104_105.ind + spec/dummy/tmp/index/test/Refinery::BlogComment/98_101_115.ind + spec/dummy/tmp/index/test/Refinery::BlogComment/99_111_109.ind + spec/dummy/tmp/index/test/Refinery::BlogComment/size + spec/dummy/tmp/index/test/Refinery::BlogComment/version + spec/dummy/tmp/index/test/Refinery::BlogPost + spec/dummy/tmp/index/test/Refinery::BlogPost/102_111_114.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/103_111_105.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/103_117_121.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/104_111_116.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/104_97_120.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/105.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/105_110.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/105_115.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/105_116.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/106_111_101.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/107_105_119.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/108_111_110.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/108_111_118.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/109_121.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/110_101_119.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/111_107_97.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/112.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/112_101_97.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/112_111_115.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/112_97_114.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/114_101.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/114_101_102.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/114_101_97.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/115_104_111.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/115_116_111.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/115_116_117.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/115_97_107.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/116_101_110.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/116_104_101.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/116_104_105.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/116_111.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/116_111_112.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/116_114_117.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/119_105_116.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/121_111_117.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/49.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/49_48.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/49_49.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/49_50.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/49_51.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/49_52.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/49_53.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/49_54.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/49_55.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/49_56.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/49_57.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/50.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/50_48.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/50_49.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/50_50.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/50_51.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/50_52.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/50_53.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/50_54.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/50_55.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/50_56.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/50_57.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/51.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/51_48.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/51_49.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/51_50.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/51_51.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/52.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/53.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/55.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/56.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/57.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/97.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/97_110_100.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/97_110_111.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/97_114_101.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/97_98_111.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/98_108_111.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/98_108_97.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/98_114_101.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/99_101_110.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/99_104_105.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/99_105_116.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/99_109_115.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/99_111_109.ind + spec/dummy/tmp/index/test/Refinery::BlogPost/size + spec/dummy/tmp/index/test/Refinery::BlogPost/version + spec/dummy/tmp/index/test/Refinery::Setting + spec/dummy/tmp/index/test/Refinery::Setting/102_114_111.ind + spec/dummy/tmp/index/test/Refinery::Setting/112_97_103.ind + spec/dummy/tmp/index/test/Refinery::Setting/115_104_97.ind + spec/dummy/tmp/index/test/Refinery::Setting/115_105_116.ind + spec/dummy/tmp/index/test/Refinery::Setting/115_116_114.ind + spec/dummy/tmp/index/test/Refinery::Setting/116_101_97.ind + spec/dummy/tmp/index/test/Refinery::Setting/117_115_101.ind + spec/dummy/tmp/index/test/Refinery::Setting/97_110_97.ind + spec/dummy/tmp/index/test/Refinery::Setting/97_112_112.ind + spec/dummy/tmp/index/test/Refinery::Setting/97_117_116.ind + spec/dummy/tmp/index/test/Refinery::Setting/97_99_116.ind + spec/dummy/tmp/index/test/Refinery::Setting/98_108_111.ind + spec/dummy/tmp/index/test/Refinery::Setting/99_111_109.ind + spec/dummy/tmp/index/test/Refinery::Setting/size + spec/dummy/tmp/index/test/Refinery::Setting/version + spec/factories + spec/factories/blog_categories.rb + spec/factories/blog_comments.rb + spec/factories/blog_posts.rb spec/models spec/models/refinery spec/models/refinery/blog_category_spec.rb spec/models/refinery/blog_comment_spec.rb spec/models/refinery/blog_post_spec.rb + spec/rcov.opts spec/requests spec/requests/blog_categories_spec.rb spec/requests/blog_posts_spec.rb spec/requests/manage_blog_posts_spec.rb + spec/spec_helper.rb todo.md ) diff --git a/spec/factories/user.rb b/spec/factories/user.rb deleted file mode 100644 index 94fe1d0..0000000 --- a/spec/factories/user.rb +++ /dev/null @@ -1,27 +0,0 @@ -require 'refinerycms/all' -require 'refinery/role' - -Factory.define :user, :class => ::Refinery::User do |u| - u.sequence(:username) { |n| "person#{n}" } - u.sequence(:email) { |n| "person#{n}@cucumber.com" } - u.password "greenandjuicy" - u.password_confirmation "greenandjuicy" -end - -Factory.define :refinery_user, :parent => :user do |u| - u.roles { [ ::Refinery::Role[:refinery] ] } - - u.after_create do |user| - ::Refinery::Plugins.registered.each_with_index do |plugin, index| - user.plugins.create(:name => plugin.name, :position => index) - end - end -end - -Factory.define :refinery_translator, :parent => :user do |u| - u.roles { [ ::Refinery::Role[:refinery], ::Refinery::Role[:translator] ] } - - u.after_create do |user| - user.plugins.create(:name => 'refinery_pages', :position => 0) - end -end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 441da1d..44506ce 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -12,9 +12,11 @@ Spork.prefork do require 'rspec/rails' require 'capybara/rspec' - require 'factory_girl' - require 'devise' require 'database_cleaner' + + require 'refinery/testing/factories' + require 'refinery/testing/controller_macros' + require 'refinery/testing/request_macros' Rails.backtrace_cleaner.remove_silencers! -- cgit v1.2.3