From 1936115668bebe6749627e33f7b0067fdf085413 Mon Sep 17 00:00:00 2001 From: junv Date: Thu, 23 Jul 2015 22:59:45 +0800 Subject: [PATCH] add active admin and devise --- Gemfile | 9 +- Gemfile.lock | 57 ++++ app/admin/admin_user.rb | 28 ++ app/admin/article.rb | 18 ++ app/admin/dashboard.rb | 33 +++ app/admin/favorite.rb | 18 ++ app/admin/like.rb | 18 ++ app/admin/share_instance.rb | 18 ++ app/admin/user.rb | 18 ++ app/admin/web_page.rb | 18 ++ app/assets/javascripts/active_admin.js.coffee | 1 + app/assets/stylesheets/active_admin.css.scss | 17 ++ app/models/admin_user.rb | 6 + app/models/article.rb | 1 + app/models/share_instance.rb | 5 + app/models/user.rb | 6 +- app/models/web_page.rb | 1 + config/environments/development.rb | 2 + config/initializers/active_admin.rb | 233 +++++++++++++++ config/initializers/devise.rb | 265 ++++++++++++++++++ config/locales/devise.en.yml | 60 ++++ config/routes.rb | 3 + .../20150723143920_create_share_instances.rb | 11 + .../20150723145030_add_devise_to_users.rb | 49 ++++ ...0150723145142_devise_create_admin_users.rb | 48 ++++ ...0723145144_create_active_admin_comments.rb | 19 ++ db/schema.rb | 59 +++- spec/models/admin_user_spec.rb | 5 + spec/models/share_instance_spec.rb | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/articles.yml | 13 - test/fixtures/comments.yml | 13 - test/fixtures/favorites.yml | 11 - test/fixtures/likes.yml | 11 - test/fixtures/users.yml | 13 - test/fixtures/web_pages.yml | 9 - test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/article_test.rb | 7 - test/models/comment_test.rb | 7 - test/models/favorite_test.rb | 7 - test/models/like_test.rb | 7 - test/models/user_test.rb | 7 - test/models/web_page_test.rb | 7 - test/test_helper.rb | 10 - 48 files changed, 1023 insertions(+), 130 deletions(-) create mode 100644 app/admin/admin_user.rb create mode 100644 app/admin/article.rb create mode 100644 app/admin/dashboard.rb create mode 100644 app/admin/favorite.rb create mode 100644 app/admin/like.rb create mode 100644 app/admin/share_instance.rb create mode 100644 app/admin/user.rb create mode 100644 app/admin/web_page.rb create mode 100644 app/assets/javascripts/active_admin.js.coffee create mode 100644 app/assets/stylesheets/active_admin.css.scss create mode 100644 app/models/admin_user.rb create mode 100644 app/models/share_instance.rb create mode 100644 config/initializers/active_admin.rb create mode 100644 config/initializers/devise.rb create mode 100644 config/locales/devise.en.yml create mode 100644 db/migrate/20150723143920_create_share_instances.rb create mode 100644 db/migrate/20150723145030_add_devise_to_users.rb create mode 100644 db/migrate/20150723145142_devise_create_admin_users.rb create mode 100644 db/migrate/20150723145144_create_active_admin_comments.rb create mode 100644 spec/models/admin_user_spec.rb create mode 100644 spec/models/share_instance_spec.rb delete mode 100644 test/controllers/.keep delete mode 100644 test/fixtures/.keep delete mode 100644 test/fixtures/articles.yml delete mode 100644 test/fixtures/comments.yml delete mode 100644 test/fixtures/favorites.yml delete mode 100644 test/fixtures/likes.yml delete mode 100644 test/fixtures/users.yml delete mode 100644 test/fixtures/web_pages.yml delete mode 100644 test/helpers/.keep delete mode 100644 test/integration/.keep delete mode 100644 test/mailers/.keep delete mode 100644 test/models/.keep delete mode 100644 test/models/article_test.rb delete mode 100644 test/models/comment_test.rb delete mode 100644 test/models/favorite_test.rb delete mode 100644 test/models/like_test.rb delete mode 100644 test/models/user_test.rb delete mode 100644 test/models/web_page_test.rb delete mode 100644 test/test_helper.rb diff --git a/Gemfile b/Gemfile index 713d02f..7812cdd 100644 --- a/Gemfile +++ b/Gemfile @@ -32,6 +32,9 @@ gem 'sdoc', '~> 0.4.0', group: :doc # Use Capistrano for deployment # gem 'capistrano-rails', group: :development +gem 'activeadmin', '~> 1.0.0.pre1' +gem 'devise' + group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' @@ -43,9 +46,7 @@ group :development, :test do gem 'spring' gem 'pry' gem 'better_errors' -end - - -group :test do gem 'rspec-rails', '~> 3.0' end + + diff --git a/Gemfile.lock b/Gemfile.lock index f52f907..8b95bfe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,6 +20,19 @@ GEM erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) + activeadmin (1.0.0.pre1) + arbre (~> 1.0, >= 1.0.2) + bourbon + coffee-rails + formtastic (~> 3.1) + formtastic_i18n + inherited_resources (~> 1.6) + jquery-rails + jquery-ui-rails (~> 5.0) + kaminari (~> 0.15) + rails (>= 3.2, < 5.0) + ransack (~> 1.3) + sass-rails activejob (4.2.3) activesupport (= 4.2.3) globalid (>= 0.3.0) @@ -36,13 +49,19 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) + arbre (1.0.3) + activesupport (>= 3.0.0) arel (6.0.2) + bcrypt (3.1.10) better_errors (2.1.1) coderay (>= 1.0.0) erubis (>= 2.6.6) rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) + bourbon (4.2.3) + sass (~> 3.4) + thor builder (3.2.2) byebug (5.0.0) columnize (= 0.9.0) @@ -56,12 +75,30 @@ GEM coffee-script-source (1.9.1.1) columnize (0.9.0) debug_inspector (0.0.2) + devise (3.5.1) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 3.2.6, < 5) + responders + thread_safe (~> 0.1) + warden (~> 1.2.3) diff-lcs (1.2.5) erubis (2.7.0) execjs (2.5.2) + formtastic (3.1.3) + actionpack (>= 3.2.13) + formtastic_i18n (0.4.1) globalid (0.3.5) activesupport (>= 4.1.0) + has_scope (0.6.0) + actionpack (>= 3.2, < 5) + activesupport (>= 3.2, < 5) i18n (0.7.0) + inherited_resources (1.6.0) + actionpack (>= 3.2, < 5) + has_scope (~> 0.6.0.rc) + railties (>= 3.2, < 5) + responders jbuilder (2.3.1) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) @@ -69,7 +106,12 @@ GEM rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) + jquery-ui-rails (5.0.5) + railties (>= 3.2.16) json (1.8.3) + kaminari (0.16.3) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) loofah (2.0.2) nokogiri (>= 1.5.9) mail (2.6.3) @@ -81,7 +123,10 @@ GEM multi_json (1.11.2) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) + orm_adapter (0.5.0) pg (0.18.2) + polyamorous (1.2.0) + activerecord (>= 3.0) pry (0.10.1) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -114,7 +159,15 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) + ransack (1.6.6) + actionpack (>= 3.0) + activerecord (>= 3.0) + activesupport (>= 3.0) + i18n + polyamorous (~> 1.2) rdoc (4.2.0) + responders (2.1.0) + railties (>= 4.2.0, < 5) rspec-core (3.3.2) rspec-support (~> 3.3.0) rspec-expectations (3.3.1) @@ -160,6 +213,8 @@ GEM uglifier (2.7.1) execjs (>= 0.3.0) json (>= 1.8.0) + warden (1.2.3) + rack (>= 1.0) web-console (2.2.1) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) @@ -170,9 +225,11 @@ PLATFORMS ruby DEPENDENCIES + activeadmin (~> 1.0.0.pre1) better_errors byebug coffee-rails (~> 4.1.0) + devise jbuilder (~> 2.0) jquery-rails pg diff --git a/app/admin/admin_user.rb b/app/admin/admin_user.rb new file mode 100644 index 0000000..433be5d --- /dev/null +++ b/app/admin/admin_user.rb @@ -0,0 +1,28 @@ +ActiveAdmin.register AdminUser do + permit_params :email, :password, :password_confirmation + + index do + selectable_column + id_column + column :email + column :current_sign_in_at + column :sign_in_count + column :created_at + actions + end + + filter :email + filter :current_sign_in_at + filter :sign_in_count + filter :created_at + + form do |f| + f.inputs "Admin Details" do + f.input :email + f.input :password + f.input :password_confirmation + end + f.actions + end + +end diff --git a/app/admin/article.rb b/app/admin/article.rb new file mode 100644 index 0000000..6545326 --- /dev/null +++ b/app/admin/article.rb @@ -0,0 +1,18 @@ +ActiveAdmin.register Article do + + + # See permitted parameters documentation: + # https://github.com/activeadmin/activeadmin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters + # + # permit_params :list, :of, :attributes, :on, :model + # + # or + # + # permit_params do + # permitted = [:permitted, :attributes] + # permitted << :other if resource.something? + # permitted + # end + + +end diff --git a/app/admin/dashboard.rb b/app/admin/dashboard.rb new file mode 100644 index 0000000..eae7baf --- /dev/null +++ b/app/admin/dashboard.rb @@ -0,0 +1,33 @@ +ActiveAdmin.register_page "Dashboard" do + + menu priority: 1, label: proc{ I18n.t("active_admin.dashboard") } + + content title: proc{ I18n.t("active_admin.dashboard") } do + div class: "blank_slate_container", id: "dashboard_default_message" do + span class: "blank_slate" do + span I18n.t("active_admin.dashboard_welcome.welcome") + small I18n.t("active_admin.dashboard_welcome.call_to_action") + end + end + + # Here is an example of a simple dashboard with columns and panels. + # + # columns do + # column do + # panel "Recent Posts" do + # ul do + # Post.recent(5).map do |post| + # li link_to(post.title, admin_post_path(post)) + # end + # end + # end + # end + + # column do + # panel "Info" do + # para "Welcome to ActiveAdmin." + # end + # end + # end + end # content +end diff --git a/app/admin/favorite.rb b/app/admin/favorite.rb new file mode 100644 index 0000000..d3e77bf --- /dev/null +++ b/app/admin/favorite.rb @@ -0,0 +1,18 @@ +ActiveAdmin.register Favorite do + + + # See permitted parameters documentation: + # https://github.com/activeadmin/activeadmin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters + # + # permit_params :list, :of, :attributes, :on, :model + # + # or + # + # permit_params do + # permitted = [:permitted, :attributes] + # permitted << :other if resource.something? + # permitted + # end + + +end diff --git a/app/admin/like.rb b/app/admin/like.rb new file mode 100644 index 0000000..e67156a --- /dev/null +++ b/app/admin/like.rb @@ -0,0 +1,18 @@ +ActiveAdmin.register Like do + + + # See permitted parameters documentation: + # https://github.com/activeadmin/activeadmin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters + # + # permit_params :list, :of, :attributes, :on, :model + # + # or + # + # permit_params do + # permitted = [:permitted, :attributes] + # permitted << :other if resource.something? + # permitted + # end + + +end diff --git a/app/admin/share_instance.rb b/app/admin/share_instance.rb new file mode 100644 index 0000000..4483a38 --- /dev/null +++ b/app/admin/share_instance.rb @@ -0,0 +1,18 @@ +ActiveAdmin.register ShareInstance do + + + # See permitted parameters documentation: + # https://github.com/activeadmin/activeadmin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters + # + # permit_params :list, :of, :attributes, :on, :model + # + # or + # + # permit_params do + # permitted = [:permitted, :attributes] + # permitted << :other if resource.something? + # permitted + # end + + +end diff --git a/app/admin/user.rb b/app/admin/user.rb new file mode 100644 index 0000000..d78949e --- /dev/null +++ b/app/admin/user.rb @@ -0,0 +1,18 @@ +ActiveAdmin.register User do + + + # See permitted parameters documentation: + # https://github.com/activeadmin/activeadmin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters + # + # permit_params :list, :of, :attributes, :on, :model + # + # or + # + # permit_params do + # permitted = [:permitted, :attributes] + # permitted << :other if resource.something? + # permitted + # end + + +end diff --git a/app/admin/web_page.rb b/app/admin/web_page.rb new file mode 100644 index 0000000..3658d3a --- /dev/null +++ b/app/admin/web_page.rb @@ -0,0 +1,18 @@ +ActiveAdmin.register WebPage do + + + # See permitted parameters documentation: + # https://github.com/activeadmin/activeadmin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters + # + # permit_params :list, :of, :attributes, :on, :model + # + # or + # + # permit_params do + # permitted = [:permitted, :attributes] + # permitted << :other if resource.something? + # permitted + # end + + +end diff --git a/app/assets/javascripts/active_admin.js.coffee b/app/assets/javascripts/active_admin.js.coffee new file mode 100644 index 0000000..3752dce --- /dev/null +++ b/app/assets/javascripts/active_admin.js.coffee @@ -0,0 +1 @@ +#= require active_admin/base diff --git a/app/assets/stylesheets/active_admin.css.scss b/app/assets/stylesheets/active_admin.css.scss new file mode 100644 index 0000000..90ba1d4 --- /dev/null +++ b/app/assets/stylesheets/active_admin.css.scss @@ -0,0 +1,17 @@ +// SASS variable overrides must be declared before loading up Active Admin's styles. +// +// To view the variables that Active Admin provides, take a look at +// `app/assets/stylesheets/active_admin/mixins/_variables.css.scss` in the +// Active Admin source. +// +// For example, to change the sidebar width: +// $sidebar-width: 242px; + +// Active Admin's got SASS! +@import "active_admin/mixins"; +@import "active_admin/base"; + +// Overriding any non-variable SASS must be done after the fact. +// For example, to change the default status-tag color: +// +// .status_tag { background: #6090DB; } diff --git a/app/models/admin_user.rb b/app/models/admin_user.rb new file mode 100644 index 0000000..318ec39 --- /dev/null +++ b/app/models/admin_user.rb @@ -0,0 +1,6 @@ +class AdminUser < ActiveRecord::Base + # Include default devise modules. Others available are: + # :confirmable, :lockable, :timeoutable and :omniauthable + devise :database_authenticatable, + :recoverable, :rememberable, :trackable, :validatable +end diff --git a/app/models/article.rb b/app/models/article.rb index 5002f1f..8ebcf2b 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -3,4 +3,5 @@ class Article < ActiveRecord::Base has_many :comments, as: :commentable has_many :likes, as: :likable has_many :favorites, as: :favoritable + has_many :share_instances, as: :sharable end diff --git a/app/models/share_instance.rb b/app/models/share_instance.rb new file mode 100644 index 0000000..a56c525 --- /dev/null +++ b/app/models/share_instance.rb @@ -0,0 +1,5 @@ +class ShareInstance < ActiveRecord::Base + + belongs_to :sharable, polymorphic: true + belongs_to :user +end diff --git a/app/models/user.rb b/app/models/user.rb index cc6d467..0bcecd8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,7 +1,11 @@ class User < ActiveRecord::Base + # Include default devise modules. Others available are: + # :confirmable, :lockable, :timeoutable and :omniauthable + devise :database_authenticatable, :registerable, + :recoverable, :rememberable, :trackable, :validatable has_many :comments has_many :likes has_many :favorites - + has_many :share_instances end diff --git a/app/models/web_page.rb b/app/models/web_page.rb index 9c72437..e283cef 100644 --- a/app/models/web_page.rb +++ b/app/models/web_page.rb @@ -3,4 +3,5 @@ class WebPage < ActiveRecord::Base has_many :comments, as: :commentable has_many :likes, as: :likable has_many :favorites, as: :favoritable + has_many :share_instances, as: :sharable end diff --git a/config/environments/development.rb b/config/environments/development.rb index b55e214..5fafdd1 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -38,4 +38,6 @@ Rails.application.configure do # Raises error for missing translations # config.action_view.raise_on_missing_translations = true + + config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } end diff --git a/config/initializers/active_admin.rb b/config/initializers/active_admin.rb new file mode 100644 index 0000000..5f6aa1d --- /dev/null +++ b/config/initializers/active_admin.rb @@ -0,0 +1,233 @@ +ActiveAdmin.setup do |config| + # == Site Title + # + # Set the title that is displayed on the main layout + # for each of the active admin pages. + # + config.site_title = "Libr X" + + # Set the link url for the title. For example, to take + # users to your main site. Defaults to no link. + # + # config.site_title_link = "/" + + # Set an optional image to be displayed for the header + # instead of a string (overrides :site_title) + # + # Note: Aim for an image that's 21px high so it fits in the header. + # + # config.site_title_image = "logo.png" + + # == Default Namespace + # + # Set the default namespace each administration resource + # will be added to. + # + # eg: + # config.default_namespace = :hello_world + # + # This will create resources in the HelloWorld module and + # will namespace routes to /hello_world/* + # + # To set no namespace by default, use: + # config.default_namespace = false + # + # Default: + # config.default_namespace = :admin + # + # You can customize the settings for each namespace by using + # a namespace block. For example, to change the site title + # within a namespace: + # + # config.namespace :admin do |admin| + # admin.site_title = "Custom Admin Title" + # end + # + # This will ONLY change the title for the admin section. Other + # namespaces will continue to use the main "site_title" configuration. + + # == User Authentication + # + # Active Admin will automatically call an authentication + # method in a before filter of all controller actions to + # ensure that there is a currently logged in admin user. + # + # This setting changes the method which Active Admin calls + # within the application controller. + config.authentication_method = :authenticate_admin_user! + + # == User Authorization + # + # Active Admin will automatically call an authorization + # method in a before filter of all controller actions to + # ensure that there is a user with proper rights. You can use + # CanCanAdapter or make your own. Please refer to documentation. + # config.authorization_adapter = ActiveAdmin::CanCanAdapter + + # In case you prefer Pundit over other solutions you can here pass + # the name of default policy class. This policy will be used in every + # case when Pundit is unable to find suitable policy. + # config.pundit_default_policy = "MyDefaultPunditPolicy" + + # You can customize your CanCan Ability class name here. + # config.cancan_ability_class = "Ability" + + # You can specify a method to be called on unauthorized access. + # This is necessary in order to prevent a redirect loop which happens + # because, by default, user gets redirected to Dashboard. If user + # doesn't have access to Dashboard, he'll end up in a redirect loop. + # Method provided here should be defined in application_controller.rb. + # config.on_unauthorized_access = :access_denied + + # == Current User + # + # Active Admin will associate actions with the current + # user performing them. + # + # This setting changes the method which Active Admin calls + # (within the application controller) to return the currently logged in user. + config.current_user_method = :current_admin_user + + # == Logging Out + # + # Active Admin displays a logout link on each screen. These + # settings configure the location and method used for the link. + # + # This setting changes the path where the link points to. If it's + # a string, the strings is used as the path. If it's a Symbol, we + # will call the method to return the path. + # + # Default: + config.logout_link_path = :destroy_admin_user_session_path + + # This setting changes the http method used when rendering the + # link. For example :get, :delete, :put, etc.. + # + # Default: + # config.logout_link_method = :get + + # == Root + # + # Set the action to call for the root path. You can set different + # roots for each namespace. + # + # Default: + # config.root_to = 'dashboard#index' + + # == Admin Comments + # + # This allows your users to comment on any resource registered with Active Admin. + # + # You can completely disable comments: + # config.comments = false + # + # You can disable the menu item for the comments index page: + # config.show_comments_in_menu = false + # + # You can change the name under which comments are registered: + # config.comments_registration_name = 'AdminComment' + + # == Batch Actions + # + # Enable and disable Batch Actions + # + config.batch_actions = true + + # == Controller Filters + # + # You can add before, after and around filters to all of your + # Active Admin resources and pages from here. + # + # config.before_filter :do_something_awesome + + # == Setting a Favicon + # + # config.favicon = 'favicon.ico' + + # == Removing Breadcrumbs + # + # Breadcrumbs are enabled by default. You can customize them for individual + # resources or you can disable them globally from here. + # + # config.breadcrumb = false + + # == Register Stylesheets & Javascripts + # + # We recommend using the built in Active Admin layout and loading + # up your own stylesheets / javascripts to customize the look + # and feel. + # + # To load a stylesheet: + # config.register_stylesheet 'my_stylesheet.css' + # + # You can provide an options hash for more control, which is passed along to stylesheet_link_tag(): + # config.register_stylesheet 'my_print_stylesheet.css', media: :print + # + # To load a javascript file: + # config.register_javascript 'my_javascript.js' + + # == CSV options + # + # Set the CSV builder separator + # config.csv_options = { col_sep: ';' } + # + # Force the use of quotes + # config.csv_options = { force_quotes: true } + + # == Menu System + # + # You can add a navigation menu to be used in your application, or configure a provided menu + # + # To change the default utility navigation to show a link to your website & a logout btn + # + # config.namespace :admin do |admin| + # admin.build_menu :utility_navigation do |menu| + # menu.add label: "My Great Website", url: "http://www.mygreatwebsite.com", html_options: { target: :blank } + # admin.add_logout_button_to_menu menu + # end + # end + # + # If you wanted to add a static menu item to the default menu provided: + # + # config.namespace :admin do |admin| + # admin.build_menu :default do |menu| + # menu.add label: "My Great Website", url: "http://www.mygreatwebsite.com", html_options: { target: :blank } + # end + # end + + # == Download Links + # + # You can disable download links on resource listing pages, + # or customize the formats shown per namespace/globally + # + # To disable/customize for the :admin namespace: + # + # config.namespace :admin do |admin| + # + # # Disable the links entirely + # admin.download_links = false + # + # # Only show XML & PDF options + # admin.download_links = [:xml, :pdf] + # + # # Enable/disable the links based on block + # # (for example, with cancan) + # admin.download_links = proc { can?(:view_download_links) } + # + # end + + # == Pagination + # + # Pagination is enabled by default for all resources. + # You can control the default per page count for all resources here. + # + # config.default_per_page = 30 + + # == Filters + # + # By default the index screen includes a "Filters" sidebar on the right + # hand side with a filter for each attribute of the registered model. + # You can enable or disable them for all resources here. + # + # config.filters = true +end diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb new file mode 100644 index 0000000..508c016 --- /dev/null +++ b/config/initializers/devise.rb @@ -0,0 +1,265 @@ +# Use this hook to configure devise mailer, warden hooks and so forth. +# Many of these configuration options can be set straight in your model. +Devise.setup do |config| + # The secret key used by Devise. Devise uses this key to generate + # random tokens. Changing this key will render invalid all existing + # confirmation, reset password and unlock tokens in the database. + # Devise will use the `secret_key_base` on Rails 4+ applications as its `secret_key` + # by default. You can change it below and use your own secret key. + # config.secret_key = '31835abd635cdd26213a1a8f39b8a634dfc676cabd9e17dab9a8de024ee7a3dc7ddc0ab88a45afd590ce92383e420ace22a4f5996b74227bdf3518999ba605de' + + # ==> Mailer Configuration + # Configure the e-mail address which will be shown in Devise::Mailer, + # note that it will be overwritten if you use your own mailer class + # with default "from" parameter. + config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' + + # Configure the class responsible to send e-mails. + # config.mailer = 'Devise::Mailer' + + # ==> ORM configuration + # Load and configure the ORM. Supports :active_record (default) and + # :mongoid (bson_ext recommended) by default. Other ORMs may be + # available as additional gems. + require 'devise/orm/active_record' + + # ==> Configuration for any authentication mechanism + # Configure which keys are used when authenticating a user. The default is + # just :email. You can configure it to use [:username, :subdomain], so for + # authenticating a user, both parameters are required. Remember that those + # parameters are used only when authenticating and not when retrieving from + # session. If you need permissions, you should implement that in a before filter. + # You can also supply a hash where the value is a boolean determining whether + # or not authentication should be aborted when the value is not present. + # config.authentication_keys = [:email] + + # Configure parameters from the request object used for authentication. Each entry + # given should be a request method and it will automatically be passed to the + # find_for_authentication method and considered in your model lookup. For instance, + # if you set :request_keys to [:subdomain], :subdomain will be used on authentication. + # The same considerations mentioned for authentication_keys also apply to request_keys. + # config.request_keys = [] + + # Configure which authentication keys should be case-insensitive. + # These keys will be downcased upon creating or modifying a user and when used + # to authenticate or find a user. Default is :email. + config.case_insensitive_keys = [:email] + + # Configure which authentication keys should have whitespace stripped. + # These keys will have whitespace before and after removed upon creating or + # modifying a user and when used to authenticate or find a user. Default is :email. + config.strip_whitespace_keys = [:email] + + # Tell if authentication through request.params is enabled. True by default. + # It can be set to an array that will enable params authentication only for the + # given strategies, for example, `config.params_authenticatable = [:database]` will + # enable it only for database (email + password) authentication. + # config.params_authenticatable = true + + # Tell if authentication through HTTP Auth is enabled. False by default. + # It can be set to an array that will enable http authentication only for the + # given strategies, for example, `config.http_authenticatable = [:database]` will + # enable it only for database authentication. The supported strategies are: + # :database = Support basic authentication with authentication key + password + # config.http_authenticatable = false + + # If 401 status code should be returned for AJAX requests. True by default. + # config.http_authenticatable_on_xhr = true + + # The realm used in Http Basic Authentication. 'Application' by default. + # config.http_authentication_realm = 'Application' + + # It will change confirmation, password recovery and other workflows + # to behave the same regardless if the e-mail provided was right or wrong. + # Does not affect registerable. + # config.paranoid = true + + # By default Devise will store the user in session. You can skip storage for + # particular strategies by setting this option. + # Notice that if you are skipping storage for all authentication paths, you + # may want to disable generating routes to Devise's sessions controller by + # passing skip: :sessions to `devise_for` in your config/routes.rb + config.skip_session_storage = [:http_auth] + + # By default, Devise cleans up the CSRF token on authentication to + # avoid CSRF token fixation attacks. This means that, when using AJAX + # requests for sign in and sign up, you need to get a new CSRF token + # from the server. You can disable this option at your own risk. + # config.clean_up_csrf_token_on_authentication = true + + # ==> Configuration for :database_authenticatable + # For bcrypt, this is the cost for hashing the password and defaults to 10. If + # using other encryptors, it sets how many times you want the password re-encrypted. + # + # Limiting the stretches to just one in testing will increase the performance of + # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use + # a value less than 10 in other environments. Note that, for bcrypt (the default + # encryptor), the cost increases exponentially with the number of stretches (e.g. + # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation). + config.stretches = Rails.env.test? ? 1 : 10 + + # Setup a pepper to generate the encrypted password. + # config.pepper = '539f71ad7ca7533a13e6259a639760931855c40f04d337feabd497e9d62203fbef19d2f68d9ce9272088362271fc23e129542d38c3945e0e683b69715ddeff8c' + + # ==> Configuration for :confirmable + # A period that the user is allowed to access the website even without + # confirming their account. For instance, if set to 2.days, the user will be + # able to access the website for two days without confirming their account, + # access will be blocked just in the third day. Default is 0.days, meaning + # the user cannot access the website without confirming their account. + # config.allow_unconfirmed_access_for = 2.days + + # A period that the user is allowed to confirm their account before their + # token becomes invalid. For example, if set to 3.days, the user can confirm + # their account within 3 days after the mail was sent, but on the fourth day + # their account can't be confirmed with the token any more. + # Default is nil, meaning there is no restriction on how long a user can take + # before confirming their account. + # config.confirm_within = 3.days + + # If true, requires any email changes to be confirmed (exactly the same way as + # initial account confirmation) to be applied. Requires additional unconfirmed_email + # db field (see migrations). Until confirmed, new email is stored in + # unconfirmed_email column, and copied to email column on successful confirmation. + config.reconfirmable = true + + # Defines which key will be used when confirming an account + # config.confirmation_keys = [:email] + + # ==> Configuration for :rememberable + # The time the user will be remembered without asking for credentials again. + # config.remember_for = 2.weeks + + # Invalidates all the remember me tokens when the user signs out. + config.expire_all_remember_me_on_sign_out = true + + # If true, extends the user's remember period when remembered via cookie. + # config.extend_remember_period = false + + # Options to be passed to the created cookie. For instance, you can set + # secure: true in order to force SSL only cookies. + # config.rememberable_options = {} + + # ==> Configuration for :validatable + # Range for password length. + config.password_length = 8..72 + + # Email regex used to validate email formats. It simply asserts that + # one (and only one) @ exists in the given string. This is mainly + # to give user feedback and not to assert the e-mail validity. + # config.email_regexp = /\A[^@]+@[^@]+\z/ + + # ==> Configuration for :timeoutable + # The time you want to timeout the user session without activity. After this + # time the user will be asked for credentials again. Default is 30 minutes. + # config.timeout_in = 30.minutes + + # If true, expires auth token on session timeout. + # config.expire_auth_token_on_timeout = false + + # ==> Configuration for :lockable + # Defines which strategy will be used to lock an account. + # :failed_attempts = Locks an account after a number of failed attempts to sign in. + # :none = No lock strategy. You should handle locking by yourself. + # config.lock_strategy = :failed_attempts + + # Defines which key will be used when locking and unlocking an account + # config.unlock_keys = [:email] + + # Defines which strategy will be used to unlock an account. + # :email = Sends an unlock link to the user email + # :time = Re-enables login after a certain amount of time (see :unlock_in below) + # :both = Enables both strategies + # :none = No unlock strategy. You should handle unlocking by yourself. + # config.unlock_strategy = :both + + # Number of authentication tries before locking an account if lock_strategy + # is failed attempts. + # config.maximum_attempts = 20 + + # Time interval to unlock the account if :time is enabled as unlock_strategy. + # config.unlock_in = 1.hour + + # Warn on the last attempt before the account is locked. + # config.last_attempt_warning = true + + # ==> Configuration for :recoverable + # + # Defines which key will be used when recovering the password for an account + # config.reset_password_keys = [:email] + + # Time interval you can reset your password with a reset password key. + # Don't put a too small interval or your users won't have the time to + # change their passwords. + config.reset_password_within = 6.hours + + # When set to false, does not sign a user in automatically after their password is + # reset. Defaults to true, so a user is signed in automatically after a reset. + # config.sign_in_after_reset_password = true + + # ==> Configuration for :encryptable + # Allow you to use another encryption algorithm besides bcrypt (default). You can use + # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1, + # :authlogic_sha512 (then you should set stretches above to 20 for default behavior) + # and :restful_authentication_sha1 (then you should set stretches to 10, and copy + # REST_AUTH_SITE_KEY to pepper). + # + # Require the `devise-encryptable` gem when using anything other than bcrypt + # config.encryptor = :sha512 + + # ==> Scopes configuration + # Turn scoped views on. Before rendering "sessions/new", it will first check for + # "users/sessions/new". It's turned off by default because it's slower if you + # are using only default views. + # config.scoped_views = false + + # Configure the default scope given to Warden. By default it's the first + # devise role declared in your routes (usually :user). + # config.default_scope = :user + + # Set this configuration to false if you want /users/sign_out to sign out + # only the current scope. By default, Devise signs out all scopes. + # config.sign_out_all_scopes = true + + # ==> Navigation configuration + # Lists the formats that should be treated as navigational. Formats like + # :html, should redirect to the sign in page when the user does not have + # access, but formats like :xml or :json, should return 401. + # + # If you have any extra navigational formats, like :iphone or :mobile, you + # should add them to the navigational formats lists. + # + # The "*/*" below is required to match Internet Explorer requests. + # config.navigational_formats = ['*/*', :html] + + # The default HTTP method used to sign out a resource. Default is :delete. + config.sign_out_via = :delete + + # ==> OmniAuth + # Add a new OmniAuth provider. Check the wiki for more information on setting + # up on your models and hooks. + # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo' + + # ==> Warden configuration + # If you want to use other strategies, that are not supported by Devise, or + # change the failure app, you can configure them inside the config.warden block. + # + # config.warden do |manager| + # manager.intercept_401 = false + # manager.default_strategies(scope: :user).unshift :some_external_strategy + # end + + # ==> Mountable engine configurations + # When using Devise inside an engine, let's call it `MyEngine`, and this engine + # is mountable, there are some extra configurations to be taken into account. + # The following options are available, assuming the engine is mounted as: + # + # mount MyEngine, at: '/my_engine' + # + # The router that invoked `devise_for`, in the example above, would be: + # config.router_name = :my_engine + # + # When using OmniAuth, Devise cannot automatically set OmniAuth path, + # so you need to do it manually. For the users scope, it would be: + # config.omniauth_path_prefix = '/my_engine/users/auth' +end diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml new file mode 100644 index 0000000..26a10f2 --- /dev/null +++ b/config/locales/devise.en.yml @@ -0,0 +1,60 @@ +# Additional translations at https://github.com/plataformatec/devise/wiki/I18n + +en: + devise: + confirmations: + confirmed: "Your email address has been successfully confirmed." + send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes." + failure: + already_authenticated: "You are already signed in." + inactive: "Your account is not activated yet." + invalid: "Invalid %{authentication_keys} or password." + locked: "Your account is locked." + last_attempt: "You have one more attempt before your account is locked." + not_found_in_database: "Invalid %{authentication_keys} or password." + timeout: "Your session expired. Please sign in again to continue." + unauthenticated: "You need to sign in or sign up before continuing." + unconfirmed: "You have to confirm your email address before continuing." + mailer: + confirmation_instructions: + subject: "Confirmation instructions" + reset_password_instructions: + subject: "Reset password instructions" + unlock_instructions: + subject: "Unlock instructions" + omniauth_callbacks: + failure: "Could not authenticate you from %{kind} because \"%{reason}\"." + success: "Successfully authenticated from %{kind} account." + passwords: + no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." + send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." + updated: "Your password has been changed successfully. You are now signed in." + updated_not_active: "Your password has been changed successfully." + registrations: + destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon." + signed_up: "Welcome! You have signed up successfully." + signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated." + signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked." + signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account." + update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address." + updated: "Your account has been updated successfully." + sessions: + signed_in: "Signed in successfully." + signed_out: "Signed out successfully." + already_signed_out: "Signed out successfully." + unlocks: + send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes." + send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes." + unlocked: "Your account has been unlocked successfully. Please sign in to continue." + errors: + messages: + already_confirmed: "was already confirmed, please try signing in" + confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one" + expired: "has expired, please request a new one" + not_found: "not found" + not_locked: "was not locked" + not_saved: + one: "1 error prohibited this %{resource} from being saved:" + other: "%{count} errors prohibited this %{resource} from being saved:" diff --git a/config/routes.rb b/config/routes.rb index 3f66539..d40985e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,7 @@ Rails.application.routes.draw do + devise_for :admin_users, ActiveAdmin::Devise.config + ActiveAdmin.routes(self) + devise_for :users # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/db/migrate/20150723143920_create_share_instances.rb b/db/migrate/20150723143920_create_share_instances.rb new file mode 100644 index 0000000..ddf6af4 --- /dev/null +++ b/db/migrate/20150723143920_create_share_instances.rb @@ -0,0 +1,11 @@ +class CreateShareInstances < ActiveRecord::Migration + def change + create_table :share_instances do |t| + t.integer :user_id + t.integer :sharable_id + t.string :sharable_type + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20150723145030_add_devise_to_users.rb b/db/migrate/20150723145030_add_devise_to_users.rb new file mode 100644 index 0000000..e479fb3 --- /dev/null +++ b/db/migrate/20150723145030_add_devise_to_users.rb @@ -0,0 +1,49 @@ +class AddDeviseToUsers < ActiveRecord::Migration + def self.up + change_table(:users) do |t| + ## Database authenticatable + # t.string :email, null: false, default: "" + t.string :encrypted_password, null: false, default: "" + + ## Recoverable + t.string :reset_password_token + t.datetime :reset_password_sent_at + + ## Rememberable + t.datetime :remember_created_at + + ## Trackable + t.integer :sign_in_count, default: 0, null: false + t.datetime :current_sign_in_at + t.datetime :last_sign_in_at + t.inet :current_sign_in_ip + t.inet :last_sign_in_ip + + ## Confirmable + # t.string :confirmation_token + # t.datetime :confirmed_at + # t.datetime :confirmation_sent_at + # t.string :unconfirmed_email # Only if using reconfirmable + + ## Lockable + # t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts + # t.string :unlock_token # Only if unlock strategy is :email or :both + # t.datetime :locked_at + + + # Uncomment below if timestamps were not included in your original model. + # t.timestamps null: false + end + + add_index :users, :email, unique: true + add_index :users, :reset_password_token, unique: true + # add_index :users, :confirmation_token, unique: true + # add_index :users, :unlock_token, unique: true + end + + def self.down + # By default, we don't want to make any assumption about how to roll back a migration when your + # model already existed. Please edit below which fields you would like to remove in this migration. + raise ActiveRecord::IrreversibleMigration + end +end diff --git a/db/migrate/20150723145142_devise_create_admin_users.rb b/db/migrate/20150723145142_devise_create_admin_users.rb new file mode 100644 index 0000000..56b6ae5 --- /dev/null +++ b/db/migrate/20150723145142_devise_create_admin_users.rb @@ -0,0 +1,48 @@ +class DeviseCreateAdminUsers < ActiveRecord::Migration + def migrate(direction) + super + # Create a default user + AdminUser.create!(email: 'admin@example.com', password: 'password', password_confirmation: 'password') if direction == :up + end + + def change + create_table(:admin_users) do |t| + ## Database authenticatable + t.string :email, null: false, default: "" + t.string :encrypted_password, null: false, default: "" + + ## Recoverable + t.string :reset_password_token + t.datetime :reset_password_sent_at + + ## Rememberable + t.datetime :remember_created_at + + ## Trackable + t.integer :sign_in_count, default: 0, null: false + t.datetime :current_sign_in_at + t.datetime :last_sign_in_at + t.inet :current_sign_in_ip + t.inet :last_sign_in_ip + + ## Confirmable + # t.string :confirmation_token + # t.datetime :confirmed_at + # t.datetime :confirmation_sent_at + # t.string :unconfirmed_email # Only if using reconfirmable + + ## Lockable + # t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts + # t.string :unlock_token # Only if unlock strategy is :email or :both + # t.datetime :locked_at + + + t.timestamps null: false + end + + add_index :admin_users, :email, unique: true + add_index :admin_users, :reset_password_token, unique: true + # add_index :admin_users, :confirmation_token, unique: true + # add_index :admin_users, :unlock_token, unique: true + end +end diff --git a/db/migrate/20150723145144_create_active_admin_comments.rb b/db/migrate/20150723145144_create_active_admin_comments.rb new file mode 100644 index 0000000..9efd147 --- /dev/null +++ b/db/migrate/20150723145144_create_active_admin_comments.rb @@ -0,0 +1,19 @@ +class CreateActiveAdminComments < ActiveRecord::Migration + def self.up + create_table :active_admin_comments do |t| + t.string :namespace + t.text :body + t.string :resource_id, null: false + t.string :resource_type, null: false + t.references :author, polymorphic: true + t.timestamps + end + add_index :active_admin_comments, [:namespace] + add_index :active_admin_comments, [:author_type, :author_id] + add_index :active_admin_comments, [:resource_type, :resource_id] + end + + def self.down + drop_table :active_admin_comments + end +end diff --git a/db/schema.rb b/db/schema.rb index b00b419..c609d7a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,11 +11,44 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150723132842) do +ActiveRecord::Schema.define(version: 20150723145144) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "active_admin_comments", force: :cascade do |t| + t.string "namespace" + t.text "body" + t.string "resource_id", null: false + t.string "resource_type", null: false + t.integer "author_id" + t.string "author_type" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "active_admin_comments", ["author_type", "author_id"], name: "index_active_admin_comments_on_author_type_and_author_id", using: :btree + add_index "active_admin_comments", ["namespace"], name: "index_active_admin_comments_on_namespace", using: :btree + add_index "active_admin_comments", ["resource_type", "resource_id"], name: "index_active_admin_comments_on_resource_type_and_resource_id", using: :btree + + create_table "admin_users", force: :cascade do |t| + t.string "email", default: "", null: false + t.string "encrypted_password", 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, null: false + t.datetime "current_sign_in_at" + t.datetime "last_sign_in_at" + t.inet "current_sign_in_ip" + t.inet "last_sign_in_ip" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + add_index "admin_users", ["email"], name: "index_admin_users_on_email", unique: true, using: :btree + add_index "admin_users", ["reset_password_token"], name: "index_admin_users_on_reset_password_token", unique: true, using: :btree + create_table "articles", force: :cascade do |t| t.string "name" t.string "url" @@ -50,15 +83,35 @@ ActiveRecord::Schema.define(version: 20150723132842) do t.datetime "updated_at", null: false end + create_table "share_instances", force: :cascade do |t| + t.integer "user_id" + t.integer "sharable_id" + t.string "sharable_type" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "users", force: :cascade do |t| t.string "email" t.string "name" t.string "sex" t.string "avatar" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "encrypted_password", 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, null: false + t.datetime "current_sign_in_at" + t.datetime "last_sign_in_at" + t.inet "current_sign_in_ip" + t.inet "last_sign_in_ip" end + add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree + add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree + create_table "web_pages", force: :cascade do |t| t.string "name" t.string "url" diff --git a/spec/models/admin_user_spec.rb b/spec/models/admin_user_spec.rb new file mode 100644 index 0000000..aec79f9 --- /dev/null +++ b/spec/models/admin_user_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe AdminUser, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/share_instance_spec.rb b/spec/models/share_instance_spec.rb new file mode 100644 index 0000000..80ae26a --- /dev/null +++ b/spec/models/share_instance_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe ShareInstance, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/test/controllers/.keep b/test/controllers/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/fixtures/.keep b/test/fixtures/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/fixtures/articles.yml b/test/fixtures/articles.yml deleted file mode 100644 index 07c787a..0000000 --- a/test/fixtures/articles.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - name: - url: - author: - content: - -two: - name: - url: - author: - content: diff --git a/test/fixtures/comments.yml b/test/fixtures/comments.yml deleted file mode 100644 index 8500f94..0000000 --- a/test/fixtures/comments.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - user_id: 1 - content: MyString - commentable_id: 1 - commentable_type: MyString - -two: - user_id: 1 - content: MyString - commentable_id: 1 - commentable_type: MyString diff --git a/test/fixtures/favorites.yml b/test/fixtures/favorites.yml deleted file mode 100644 index f827ee2..0000000 --- a/test/fixtures/favorites.yml +++ /dev/null @@ -1,11 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - user_id: 1 - favoritable_id: 1 - favoritable_type: MyString - -two: - user_id: 1 - favoritable_id: 1 - favoritable_type: MyString diff --git a/test/fixtures/likes.yml b/test/fixtures/likes.yml deleted file mode 100644 index 0e447e0..0000000 --- a/test/fixtures/likes.yml +++ /dev/null @@ -1,11 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - user_id: 1 - likable_id: 1 - likable_type: MyString - -two: - user_id: 1 - likable_id: 1 - likable_type: MyString diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml deleted file mode 100644 index ec08189..0000000 --- a/test/fixtures/users.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - email: MyString - name: MyString - sex: MyString - avatar: MyString - -two: - email: MyString - name: MyString - sex: MyString - avatar: MyString diff --git a/test/fixtures/web_pages.yml b/test/fixtures/web_pages.yml deleted file mode 100644 index feebab7..0000000 --- a/test/fixtures/web_pages.yml +++ /dev/null @@ -1,9 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - name: - url: - -two: - name: - url: diff --git a/test/helpers/.keep b/test/helpers/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/integration/.keep b/test/integration/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/mailers/.keep b/test/mailers/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/models/.keep b/test/models/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/models/article_test.rb b/test/models/article_test.rb deleted file mode 100644 index 11c8abe..0000000 --- a/test/models/article_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class ArticleTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/test/models/comment_test.rb b/test/models/comment_test.rb deleted file mode 100644 index b6d6131..0000000 --- a/test/models/comment_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class CommentTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/test/models/favorite_test.rb b/test/models/favorite_test.rb deleted file mode 100644 index 1cc6656..0000000 --- a/test/models/favorite_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class FavoriteTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/test/models/like_test.rb b/test/models/like_test.rb deleted file mode 100644 index 1eea991..0000000 --- a/test/models/like_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class LikeTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/test/models/user_test.rb b/test/models/user_test.rb deleted file mode 100644 index 82f61e0..0000000 --- a/test/models/user_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class UserTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/test/models/web_page_test.rb b/test/models/web_page_test.rb deleted file mode 100644 index c2c8ddc..0000000 --- a/test/models/web_page_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class WebPageTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/test/test_helper.rb b/test/test_helper.rb deleted file mode 100644 index 92e39b2..0000000 --- a/test/test_helper.rb +++ /dev/null @@ -1,10 +0,0 @@ -ENV['RAILS_ENV'] ||= 'test' -require File.expand_path('../../config/environment', __FILE__) -require 'rails/test_help' - -class ActiveSupport::TestCase - # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. - fixtures :all - - # Add more helper methods to be used by all tests here... -end