diff --git a/app/controllers/bubbles_controller.rb b/app/controllers/bubbles_controller.rb index 0fbf9d62f..e1d992064 100644 --- a/app/controllers/bubbles_controller.rb +++ b/app/controllers/bubbles_controller.rb @@ -41,6 +41,6 @@ class BubblesController < ApplicationController end def bubble_params - params.require(:bubble).permit(:title, :body, :color, :due_on, :image, tag_ids: []) + params.require(:bubble).permit(:title, :color, :due_on, :image, tag_ids: []) end end diff --git a/db/migrate/20240919141003_remove_body_from_bubbles.rb b/db/migrate/20240919141003_remove_body_from_bubbles.rb new file mode 100644 index 000000000..49d350991 --- /dev/null +++ b/db/migrate/20240919141003_remove_body_from_bubbles.rb @@ -0,0 +1,5 @@ +class RemoveBodyFromBubbles < ActiveRecord::Migration[8.0] + def change + remove_column :bubbles, :body, :string + end +end diff --git a/db/migrate/20240919141018_remove_body_from_boosts.rb b/db/migrate/20240919141018_remove_body_from_boosts.rb new file mode 100644 index 000000000..50de21235 --- /dev/null +++ b/db/migrate/20240919141018_remove_body_from_boosts.rb @@ -0,0 +1,5 @@ +class RemoveBodyFromBoosts < ActiveRecord::Migration[8.0] + def change + remove_column :boosts, :body, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 906cfe944..0fc61b403 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.0].define(version: 2024_09_17_174301) do +ActiveRecord::Schema[8.0].define(version: 2024_09_19_141018) do create_table "accesses", force: :cascade do |t| t.integer "project_id", null: false t.integer "user_id", null: false @@ -66,7 +66,6 @@ ActiveRecord::Schema[8.0].define(version: 2024_09_17_174301) do end create_table "boosts", force: :cascade do |t| - t.string "body" t.integer "creator_id", null: false t.integer "bubble_id", null: false t.datetime "created_at", null: false @@ -76,7 +75,6 @@ ActiveRecord::Schema[8.0].define(version: 2024_09_17_174301) do create_table "bubbles", force: :cascade do |t| t.string "title" - t.text "body" t.string "color" t.datetime "created_at", null: false t.datetime "updated_at", null: false diff --git a/test/fixtures/boosts.yml b/test/fixtures/boosts.yml index 5c7d39964..b5f637f89 100644 --- a/test/fixtures/boosts.yml +++ b/test/fixtures/boosts.yml @@ -1,25 +1,15 @@ -# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - body: "" - creator: jz +logo_one: bubble: logo - created_at: <%= 3.seconds.from_now %> - -two: - body: "" creator: jz - bubble: layout - created_at: <%= 3.seconds.from_now %> -three: - body: "" +logo_two: + bubble: logo + creator: jz + +logo_three: + bubble: logo creator: kevin - bubble: logo - created_at: <%= 3.seconds.from_now %> -four: - body: "" +layout_one: + bubble: layout creator: jz - bubble: logo - created_at: <%= 3.seconds.from_now %> diff --git a/test/fixtures/bubbles.yml b/test/fixtures/bubbles.yml index 5cf537089..4ff7dceaf 100644 --- a/test/fixtures/bubbles.yml +++ b/test/fixtures/bubbles.yml @@ -2,20 +2,17 @@ logo: project: writebook creator: david title: The logo isn't big enough - body: Make the logo bigger. - color: '#ED8008' + color: "#ED8008" due_on: <%= 3.days.from_now %> layout: project: writebook creator: david title: Layout is broken - body: The page scrolls horizontally on mobile devices. - color: '#698F9C' + color: "#698F9C" text: project: writebook creator: kevin title: The text is too small - body: Increase the font size. color: "#3B4B59"