diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-watched-words-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-watched-words-test.js index 836cc539ed9..6c17c7f69bb 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/admin-watched-words-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/admin-watched-words-test.js @@ -148,7 +148,7 @@ acceptance("Admin - Watched Words", function (needs) { assert.dom(".d-modal__body li .tag").hasText("greeting"); }); - test("showing/hidding words - tag", async function (assert) { + test("showing/hiding words - tag", async function (assert) { await visit("/admin/customize/watched_words/action/tag"); await click(".show-words-checkbox"); diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-email-settings-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-email-settings-test.js index bacc8b9a816..ddbd7d2beca 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-email-settings-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-email-settings-test.js @@ -218,7 +218,7 @@ acceptance( ); acceptance( - "Managing Group Email Settings - SMTP and IMAP Enabled - Settings Preflled", + "Managing Group Email Settings - SMTP and IMAP Enabled - Settings Prefilled", function (needs) { needs.user(); needs.settings({ enable_smtp: true, enable_imap: true }); diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js index ba24ce52761..645a39ac338 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js @@ -745,7 +745,7 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) { ); }); - test("visiting category discovery no subcategoriees route", async function (assert) { + test("visiting category discovery no subcategories route", async function (assert) { const { category1 } = setupUserSidebarCategories(); await visit(`/c/${category1.slug}/${category1.id}/none`); diff --git a/app/models/category_list.rb b/app/models/category_list.rb index 39cafac9172..02f97560781 100644 --- a/app/models/category_list.rb +++ b/app/models/category_list.rb @@ -12,8 +12,8 @@ class CategoryList attr_accessor :categories, :uncategorized def self.register_included_association(association) - @included_assocations ||= [] - @included_assocations << association if !@included_assocations.include?(association) + @included_associations ||= [] + @included_associations << association if !@included_associations.include?(association) end def self.included_associations @@ -24,7 +24,7 @@ class CategoryList :uploaded_logo_dark, :topic_only_relative_url, subcategories: [:topic_only_relative_url], - ].concat(@included_assocations || []) + ].concat(@included_associations || []) end def initialize(guardian = nil, options = {}) diff --git a/spec/lib/discourse_redis_spec.rb b/spec/lib/discourse_redis_spec.rb index e5214c1dd42..de9d57947c6 100644 --- a/spec/lib/discourse_redis_spec.rb +++ b/spec/lib/discourse_redis_spec.rb @@ -162,7 +162,7 @@ RSpec.describe DiscourseRedis do end describe "#eval" do - it "keys and arvg are passed correcty" do + it "keys and argv are passed correctly" do keys = %w[key1 key2] argv = %w[arg1 arg2] @@ -177,7 +177,7 @@ RSpec.describe DiscourseRedis do end describe "#evalsha" do - it "keys and arvg are passed correcty" do + it "keys and argv are passed correctly" do keys = %w[key1 key2] argv = %w[arg1 arg2] diff --git a/spec/lib/discourse_spec.rb b/spec/lib/discourse_spec.rb index 5671149c65c..12a3928d223 100644 --- a/spec/lib/discourse_spec.rb +++ b/spec/lib/discourse_spec.rb @@ -48,14 +48,14 @@ RSpec.describe Discourse do context "with a non standard port specified" do before { SiteSetting.port = 3000 } - it "returns the non standart port in the base url" do + it "returns the non standard port in the base url" do expect(Discourse.base_url).to eq("http://foo.com:3000") end end end describe "asset_filter_options" do - it "obmits path if request is missing" do + it "omits path if request is missing" do opts = Discourse.asset_filter_options(:js, nil) expect(opts[:path]).to be_blank end