<%= @outline_item.text %>
\ No newline at end of file diff --git a/config/application.rb b/config/application.rb index fbff456..4ebeaa7 100644 --- a/config/application.rb +++ b/config/application.rb @@ -9,7 +9,7 @@ module Web class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 6.0 + config.load_defaults 7.1 # Settings in config/environments/* take precedence over those specified here. # Application configuration can go into files in config/initializers diff --git a/config/initializers/rails_admin.rb b/config/initializers/rails_admin.rb deleted file mode 100644 index e76b0e6..0000000 --- a/config/initializers/rails_admin.rb +++ /dev/null @@ -1,44 +0,0 @@ -require 'nested_form/engine' -require 'nested_form/builder_mixin' - -RailsAdmin.config do |config| - - ### Popular gems integration - - ## == Devise == - config.authenticate_with do - warden.authenticate! scope: :user - end - config.current_user_method(&:current_user) - - ## == CancanCan == - config.authorize_with :cancancan - - ## == Pundit == - # config.authorize_with :pundit - - ## == PaperTrail == - # config.audit_with :paper_trail, 'User', 'PaperTrail::Version' # PaperTrail >= 3.0.0 - - ### More at https://github.com/sferik/rails_admin/wiki/Base-configuration - - ## == Gravatar integration == - ## To disable Gravatar integration in Navigation Bar set to false - # config.show_gravatar = true - - config.actions do - dashboard # mandatory - index # mandatory - new - export - bulk_delete - show - edit - delete - show_in_app - - ## With an audit adapter, you can add: - # history_index - # history_show - end -end diff --git a/config/routes.rb b/config/routes.rb index e585b04..43ca22a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,4 @@ Rails.application.routes.draw do - mount RailsAdmin::Engine => '/admin', as: 'rails_admin' mount Blazer::Engine, at: 'blazer' devise_for :user diff --git a/db/schema.rb b/db/schema.rb index 20d9cef..2c40005 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,14 +10,13 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2022_07_09_194955) do - +ActiveRecord::Schema[7.1].define(version: 2022_07_09_194955) do create_table "blazer_audits", force: :cascade do |t| t.integer "user_id" t.integer "query_id" t.text "statement" t.string "data_source" - t.datetime "created_at" + t.datetime "created_at", precision: nil t.index ["query_id"], name: "index_blazer_audits_on_query_id" t.index ["user_id"], name: "index_blazer_audits_on_user_id" end @@ -31,9 +30,9 @@ t.text "slack_channels" t.string "check_type" t.text "message" - t.datetime "last_run_at" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "last_run_at", precision: nil + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["creator_id"], name: "index_blazer_checks_on_creator_id" t.index ["query_id"], name: "index_blazer_checks_on_query_id" end @@ -42,8 +41,8 @@ t.integer "dashboard_id" t.integer "query_id" t.integer "position" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["dashboard_id"], name: "index_blazer_dashboard_queries_on_dashboard_id" t.index ["query_id"], name: "index_blazer_dashboard_queries_on_query_id" end @@ -51,8 +50,8 @@ create_table "blazer_dashboards", force: :cascade do |t| t.integer "creator_id" t.string "name" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["creator_id"], name: "index_blazer_dashboards_on_creator_id" end @@ -63,8 +62,8 @@ t.text "statement" t.string "data_source" t.string "status" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["creator_id"], name: "index_blazer_queries_on_creator_id" end @@ -73,13 +72,13 @@ t.integer "attempts", default: 0, null: false t.text "handler", null: false t.text "last_error" - t.datetime "run_at" - t.datetime "locked_at" - t.datetime "failed_at" + t.datetime "run_at", precision: nil + t.datetime "locked_at", precision: nil + t.datetime "failed_at", precision: nil t.string "locked_by" t.string "queue" - t.datetime "created_at", precision: 6 - t.datetime "updated_at", precision: 6 + t.datetime "created_at" + t.datetime "updated_at" t.index ["priority", "run_at"], name: "delayed_jobs_priority" end @@ -89,24 +88,24 @@ t.boolean "completed", default: false t.integer "position" t.string "timestamps" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["outline_id"], name: "index_outline_items_on_outline_id" end create_table "outlines", force: :cascade do |t| t.integer "story_id" t.integer "completion" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["story_id"], name: "index_outlines_on_story_id" end create_table "stories", force: :cascade do |t| t.string "title", null: false t.integer "user_id", null: false - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["user_id"], name: "index_stories_on_user_id" end @@ -114,10 +113,10 @@ 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.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "reset_password_sent_at", precision: nil + t.datetime "remember_created_at", precision: nil + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.boolean "admin_role" t.index ["email"], name: "index_users_on_email", unique: true t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true @@ -126,8 +125,8 @@ create_table "writing_sessions", force: :cascade do |t| t.integer "word_count" t.text "text" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.integer "user_id" t.integer "story_id", null: false t.index ["story_id"], name: "index_writing_sessions_on_story_id" diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake index d3d1f31..920f137 100644 --- a/lib/tasks/test.rake +++ b/lib/tasks/test.rake @@ -1,9 +1,9 @@ namespace :test do desc 'Run tests with coverage' task :coverage do - require 'simplecov' - SimpleCov.start 'rails' + ENV['SIMPLECOV'] = 'true' + # Run all test types Rake::Task['test'].invoke end end diff --git a/test/controllers/outline_items_controller_test.rb b/test/controllers/outline_items_controller_test.rb index b930058..b29b50a 100644 --- a/test/controllers/outline_items_controller_test.rb +++ b/test/controllers/outline_items_controller_test.rb @@ -1,7 +1,123 @@ -require "test_helper" +require 'test_helper' class OutlineItemsControllerTest < ActionDispatch::IntegrationTest - # test "the truth" do - # assert true - # end + include Devise::Test::IntegrationHelpers + + setup do + @user = users(:bob) + @story = stories(:one) + @outline = outlines(:one) + @outline_item = outline_items(:one) + sign_in @user + end + + test 'should get new' do + get new_story_outline_outline_item_path(@story) + assert_response :success + end + + test 'should not get new if unauthorized' do + sign_out @user + get new_story_outline_outline_item_path(@story) + assert_redirected_to '/user/sign_in' + end + + test 'should show outline item' do + get story_outline_outline_item_path(@story, @outline_item) + assert_response :success + end + + test 'should not show outline item if unauthorized' do + sign_out @user + get story_outline_outline_item_path(@story, @outline_item) + assert_redirected_to '/user/sign_in' + end + + test 'should create outline item' do + assert_difference('OutlineItem.count') do + post story_outline_outline_items_path(@story), params: { + outline_item: { text: 'New outline item' } + } + end + assert_redirected_to story_outline_path(@story) + end + + test 'should create multiple outline items from multiline text' do + assert_difference('OutlineItem.count', 3) do + post story_outline_outline_items_path(@story), params: { + outline_item: { text: "First item\nSecond item\nThird item" } + } + end + assert_redirected_to story_outline_path(@story) + end + + test 'should not create outline item if unauthorized' do + sign_out @user + assert_no_difference('OutlineItem.count') do + post story_outline_outline_items_path(@story), params: { + outline_item: { text: 'New outline item' } + } + end + assert_redirected_to '/user/sign_in' + end + + test 'should update outline item' do + patch story_outline_outline_item_path(@story, @outline_item), params: { + outline_item: { text: 'Updated text' } + } + assert_redirected_to story_outline_path(@story) + @outline_item.reload + assert_equal 'Updated text', @outline_item.text + end + + test 'should update outline item position' do + patch story_outline_outline_item_path(@story, @outline_item), params: { + outline_item: { position: 2, text: @outline_item.text } + } + assert_redirected_to story_outline_path(@story) + @outline_item.reload + assert_equal 2, @outline_item.position + end + + test 'should delete outline item when text is empty' do + assert_difference('OutlineItem.count', -1) do + patch story_outline_outline_item_path(@story, @outline_item), params: { + outline_item: { text: '' } + } + end + assert_redirected_to story_outline_path(@story) + end + + test 'should not update outline item if unauthorized' do + sign_out @user + patch story_outline_outline_item_path(@story, @outline_item), params: { + outline_item: { text: 'Updated text' } + } + assert_redirected_to '/user/sign_in' + @outline_item.reload + assert_not_equal 'Updated text', @outline_item.text + end + + test 'should destroy outline item' do + assert_difference('OutlineItem.count', -1) do + delete story_outline_outline_item_path(@story, @outline_item) + end + assert_response :ok + end + + test 'should not destroy outline item if unauthorized' do + sign_out @user + assert_no_difference('OutlineItem.count') do + delete story_outline_outline_item_path(@story, @outline_item) + end + assert_redirected_to '/user/sign_in' + end + + test 'should create outline if story has none' do + story_without_outline = stories(:two) + assert_difference('Outline.count') do + get new_story_outline_outline_item_path(story_without_outline) + end + assert_response :success + end end diff --git a/test/controllers/stories_controller_test.rb b/test/controllers/stories_controller_test.rb index 8548073..6b375ad 100644 --- a/test/controllers/stories_controller_test.rb +++ b/test/controllers/stories_controller_test.rb @@ -42,18 +42,116 @@ class StoriesControllerTest < ActionDispatch::IntegrationTest assert_response :redirect assert_redirected_to story_url(Story.last) end + + should 'not create story with invalid params' do + assert_no_difference('Story.count') do + post stories_url, params: { story: { title: '' } } + end + assert_response :unprocessable_entity + end end context '#show' do - story = nil - setup do - story = users(:bob).stories.create({ title: 'New Story' }) + @story = users(:bob).stories.create({ title: 'New Story' }) + @writing_sessions = [] + 3.times do + @writing_sessions << @story.writing_sessions.create!(word_count: 100, user: users(:bob)) + end + sign_in users(:bob) end should 'return story' do - get story_url(story.id) + get story_url(@story.id) + assert_response :success + end + + should 'assign writing sessions' do + get story_url(@story.id) + assert_equal @writing_sessions.map(&:id).sort, assigns(:writing_sessions).map(&:id).sort + end + + should 'calculate total word count' do + get story_url(@story.id) + assert_equal 300, assigns(:word_count_total) + end + + should 'assign next outline item' do + outline = Outline.create!(story: @story) + outline_item = outline.outline_items.create!(text: 'Test Item') + get story_url(@story.id) + assert_equal outline_item, assigns(:next_outline_item) + end + + should 'prevent access to other users stories' do + other_story = users(:admin).stories.create({ title: 'Other Story' }) + get story_url(other_story.id) + assert_redirected_to root_path + end + end + + context '#edit' do + setup do + @story = users(:bob).stories.create({ title: 'New Story' }) + end + + should 'get edit form' do + get edit_story_url(@story.id) assert_response :success end + + should 'prevent editing other users stories' do + other_story = users(:admin).stories.create({ title: 'Other Story' }) + get edit_story_url(other_story.id) + assert_redirected_to root_path + end + end + + context '#update' do + setup do + @story = users(:bob).stories.create({ title: 'New Story' }) + end + + should 'update story with valid params' do + patch story_url(@story.id), params: { story: { title: 'Updated Title' } } + @story.reload + assert_equal 'Updated Title', @story.title + assert_response :success + end + + should 'not update story with invalid params' do + original_title = @story.title + patch story_url(@story.id), params: { story: { title: '' } } + @story.reload + assert_equal original_title, @story.title + assert_response :unprocessable_entity + end + + should 'prevent updating other users stories' do + other_story = users(:admin).stories.create({ title: 'Other Story' }) + patch story_url(other_story.id), params: { story: { title: 'Updated Title' } } + assert_redirected_to root_path + end + end + + context '#destroy' do + setup do + @story = users(:bob).stories.create({ title: 'New Story' }) + end + + should 'destroy story' do + assert_difference('Story.count', -1) do + delete story_url(@story.id) + end + assert_redirected_to stories_url + end + + should 'prevent destroying other users stories' do + other_story = users(:admin).stories.create({ title: 'Other Story' }) + assert_no_difference('Story.count') do + delete story_url(other_story.id) + end + assert_redirected_to root_path + end end end diff --git a/test/fixtures/outline_items.yml b/test/fixtures/outline_items.yml index ecc6831..99cc9d8 100644 --- a/test/fixtures/outline_items.yml +++ b/test/fixtures/outline_items.yml @@ -17,6 +17,6 @@ two: # column: value three: - outline: two - text: "chapter 1" - position: 1 + outline: one + text: "chapter 3" + position: 3 diff --git a/test/fixtures/outlines.yml b/test/fixtures/outlines.yml index b9a8d4f..38d499d 100644 --- a/test/fixtures/outlines.yml +++ b/test/fixtures/outlines.yml @@ -7,5 +7,4 @@ one: story: one -two: - story: two +# Note: story two intentionally has no outline to test outline creation diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 555ea1d..1afba43 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -7,11 +7,14 @@ bob: email: test@email.com admin_role: false + encrypted_password: <%= User.new.send(:password_digest, 'password123') %> jane: email: jane@email.com admin_role: false + encrypted_password: <%= User.new.send(:password_digest, 'password123') %> admin: email: admin@email.com admin_role: true + encrypted_password: <%= User.new.send(:password_digest, 'password123') %> diff --git a/test/test_helper.rb b/test/test_helper.rb index 37934eb..625f290 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,5 +1,15 @@ # frozen_string_literal: true +if ENV['SIMPLECOV'] + require 'simplecov' + + SimpleCov.start 'rails' do + add_group 'Components', 'app/components' + add_group 'Services', 'app/services' + add_filter 'lib/generators' + end +end + ENV['RAILS_ENV'] ||= 'test' require_relative '../config/environment' require 'rails/test_help' @@ -9,6 +19,16 @@ class TestCase # Run tests in parallel with specified workers parallelize(workers: :number_of_processors) + if ENV['SIMPLECOV'] + parallelize_setup do |worker| + SimpleCov.command_name "#{SimpleCov.command_name}-#{worker}" + end + + parallelize_teardown do + SimpleCov.result + end + end + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. fixtures :all