A platform for community discussion. Free, open, simple.
DEV: Simplify Rewind specs
Régis Hanolb38cd90b5ffc
diff --git a/plugins/discourse-rewind/spec/actions/activity_calendar_spec.rb b/plugins/discourse-rewind/spec/actions/activity_calendar_spec.rbindex 779514b4202..7f683d7f056 100644--- a/plugins/discourse-rewind/spec/actions/activity_calendar_spec.rb+++ b/plugins/discourse-rewind/spec/actions/activity_calendar_spec.rb@@ -1,7 +1,6 @@# frozen_string_literal: trueRSpec.describe DiscourseRewind::Action::ActivityCalendar do- fab!(:date) { Date.new(2021).all_year }fab!(:user)fab!(:other_user, :user)@@ -13,24 +12,27 @@ RSpec.describe DiscourseRewind::Action::ActivityCalendar dofab!(:post_6) { Fabricate(:post, user: user, created_at: Date.new(2022, 02, 27)) }fab!(:user_visit_1) do- UserVisit.create!(- user_id: user.id,+ Fabricate(+ :user_visit,+ user: user,visited_at: Date.new(2021, 3, 10),posts_read: 5,time_read: 120,)endfab!(:user_visit_2) do- UserVisit.create!(- user_id: user.id,+ Fabricate(+ :user_visit,+ user: user,visited_at: Date.new(2021, 4, 18),posts_read: 12,time_read: 1200,)endfab!(:user_visit_3) do- UserVisit.create!(- user_id: other_user.id,+ Fabricate(+ :user_visit,+ user: other_user,visited_at: Date.new(2021, 7, 24),posts_read: 12,time_read: 1200,diff --git a/plugins/discourse-rewind/spec/actions/most_viewed_categories_spec.rb b/plugins/discourse-rewind/spec/actions/most_viewed_categories_spec.rbindex 5cb47add201..c20a622ba62 100644--- a/plugins/discourse-rewind/spec/actions/most_viewed_categories_spec.rb+++ b/plugins/discourse-rewind/spec/actions/most_viewed_categories_spec.rb@@ -1,7 +1,6 @@# frozen_string_literal: trueRSpec.describe DiscourseRewind::Action::MostViewedCategories do- fab!(:date) { Date.new(2021).all_year }fab!(:user)fab!(:other_user, :user)@@ -18,31 +17,18 @@ RSpec.describe DiscourseRewind::Action::MostViewedCategories dofab!(:topic_5) { Fabricate(:topic, category: category_4) }fab!(:topic_6) { Fabricate(:topic, category: category_5) }- before { SiteSetting.discourse_rewind_enabled = true }-describe ".call" doit "returns top 4 most viewed categories ordered by view count" do- # Category 1: 2 viewsTopicViewItem.add(topic_1.id, "127.0.0.1", user.id, Date.new(2021, 3, 15))TopicViewItem.add(topic_2.id, "127.0.0.2", user.id, Date.new(2021, 4, 20))-- # Category 2: 1 viewTopicViewItem.add(topic_3.id, "127.0.0.3", user.id, Date.new(2021, 5, 10))-- # Category 3: 1 viewTopicViewItem.add(topic_4.id, "127.0.0.4", user.id, Date.new(2021, 6, 5))-- # Category 4: 3 views (same topic, multiple views)TopicViewItem.add(topic_5.id, "127.0.0.5", user.id, Date.new(2021, 7, 1))TopicViewItem.add(topic_5.id, "127.0.0.6", user.id, Date.new(2021, 8, 15))TopicViewItem.add(topic_5.id, "127.0.0.7", user.id, Date.new(2021, 9, 20))- # Category 5: 0 views-result = call_report- expect(result[:identifier]).to eq("most-viewed-categories")- expect(result[:data].length).to eq(4)expect(result[:data]).to eq([{ category_id: category_1.id, name: "Technology" },@@ -53,17 +39,6 @@ RSpec.describe DiscourseRewind::Action::MostViewedCategories do)end- it "only includes categories the user can see (no read-restricted/private categories)" do- group = Fabricate(:group)- private_category = Fabricate(:private_category, group: group)- private_topic = Fabricate(:topic, category: private_category)-- TopicViewItem.add(private_topic.id, "127.0.0.1", user.id, Date.new(2021, 3, 15))-- result = call_report- expect(result[:data].map { |c| c[:category_id] }).not_to include(private_category.id)- end-it "filters by date range" doTopicViewItem.add(topic_1.id, "127.0.0.1", user.id, Date.new(2021, 3, 15))TopicViewItem.add(topic_2.id, "127.0.0.2", user.id, Date.new(2020, 12, 31))diff --git a/plugins/discourse-rewind/spec/actions/most_viewed_tags_spec.rb b/plugins/discourse-rewind/spec/actions/most_viewed_tags_spec.rbindex 9b3e842de29..b72aa59c214 100644--- a/plugins/discourse-rewind/spec/actions/most_viewed_tags_spec.rb+++ b/plugins/discourse-rewind/spec/actions/most_viewed_tags_spec.rb@@ -1,7 +1,6 @@# frozen_string_literal: trueRSpec.describe DiscourseRewind::Action::MostViewedTags do- fab!(:date) { Date.new(2021).all_year }fab!(:user)fab!(:other_user, :user)@@ -11,55 +10,27 @@ RSpec.describe DiscourseRewind::Action::MostViewedTags dofab!(:tag_4) { Fabricate(:tag, name: "golang") }fab!(:tag_5) { Fabricate(:tag, name: "rust") }- fab!(:topic_1, :topic)- fab!(:topic_2, :topic)- fab!(:topic_3, :topic)- fab!(:topic_4, :topic)- fab!(:topic_5, :topic)+ fab!(:topic_1) { Fabricate(:topic, tags: [tag_1]) }+ fab!(:topic_2) { Fabricate(:topic, tags: [tag_1]) }+ fab!(:topic_3) { Fabricate(:topic, tags: [tag_2]) }+ fab!(:topic_4) { Fabricate(:topic, tags: [tag_3]) }+ fab!(:topic_5) { Fabricate(:topic, tags: [tag_4]) }- before do- SiteSetting.tagging_enabled = true-- topic_1.tags = [tag_1]- topic_2.tags = [tag_1]- topic_3.tags = [tag_2]- topic_4.tags = [tag_3]- topic_5.tags = [tag_4]- end+ before { SiteSetting.tagging_enabled = true }describe ".call" do- it "ignores personal messages and read-restricted categories" do- restricted_topic =- Fabricate(:topic, category: Fabricate(:private_category, group: Fabricate(:group)))- [Fabricate(:private_message_topic), restricted_topic].each do |topic|- topic.tags = [tag_5]- TopicViewItem.add(topic.id, "127.0.0.1", user.id, Date.new(2021, 3, 15))- end-- expect(call_report[:data]).to be_empty- end-it "returns top 4 most viewed tags ordered by view count" do- # Tag 1 (ruby): 2 views (2 different topics)TopicViewItem.add(topic_1.id, "127.0.0.1", user.id, Date.new(2021, 3, 15))TopicViewItem.add(topic_2.id, "127.0.0.2", user.id, Date.new(2021, 4, 20))-- # Tag 2 (javascript): 1 viewTopicViewItem.add(topic_3.id, "127.0.0.3", user.id, Date.new(2021, 5, 10))-- # Tag 3 (python): 1 viewTopicViewItem.add(topic_4.id, "127.0.0.4", user.id, Date.new(2021, 6, 5))-- # Tag 4 (golang): 3 views (same topic, multiple views)TopicViewItem.add(topic_5.id, "127.0.0.5", user.id, Date.new(2021, 7, 1))TopicViewItem.add(topic_5.id, "127.0.0.6", user.id, Date.new(2021, 8, 15))TopicViewItem.add(topic_5.id, "127.0.0.7", user.id, Date.new(2021, 9, 20))- # Tag 5 (rust): 0 views-result = call_report- expect(result[:data]).to match_array(+ expect(result[:data]).to eq([{ tag_id: tag_1.id, slug: "ruby", name: "ruby" },{ tag_id: tag_2.id, slug: "javascript", name: "javascript" },@@ -69,19 +40,17 @@ RSpec.describe DiscourseRewind::Action::MostViewedTags do)end- it "only includes tags the user can see (no restricted tags)" do- group = Fabricate(:group)- tag_group = Fabricate(:tag_group, tags: [tag_5])- tag_group.permissions = { group.name => TagGroupPermission.permission_types[:full] }- tag_group.save!-- restricted_topic = Fabricate(:topic)+ it "excludes views of personal messages and restricted categories" do+ private_message = Fabricate(:private_message_topic)+ private_message.tags = [tag_5]+ restricted_topic =+ Fabricate(:topic, category: Fabricate(:private_category, group: Fabricate(:group)))restricted_topic.tags = [tag_5]+ [private_message, restricted_topic].each do |topic|+ TopicViewItem.add(topic.id, "127.0.0.1", user.id, Date.new(2021, 3, 15))+ end- TopicViewItem.add(restricted_topic.id, "127.0.0.1", user.id, Date.new(2021, 3, 15))-- result = call_report- expect(result[:data].map { |t| t[:tag_id] }).not_to include(tag_5.id)+ expect(call_report[:data].map { |tag| tag[:tag_id] }).not_to include(tag_5.id)endit "filters by date range" do@@ -104,21 +73,6 @@ RSpec.describe DiscourseRewind::Action::MostViewedTags doexpect(result[:data].first[:tag_id]).to eq(tag_1.id)end- it "counts distinct topics per tag" do- multi_tag_topic = Fabricate(:topic)- multi_tag_topic.tags = [tag_1, tag_2]-- TopicViewItem.add(multi_tag_topic.id, "127.0.0.1", user.id, Date.new(2021, 3, 15))- TopicViewItem.add(multi_tag_topic.id, "127.0.0.2", user.id, Date.new(2021, 4, 20))-- result = call_report-- tag_1_data = result[:data].find { |t| t[:tag_id] == tag_1.id }- tag_2_data = result[:data].find { |t| t[:tag_id] == tag_2.id }- expect(tag_1_data).not_to be_nil- expect(tag_2_data).not_to be_nil- end-it "returns empty array when no views" doresult = call_report@@ -130,7 +84,6 @@ RSpec.describe DiscourseRewind::Action::MostViewedTags dofab!(:restricted_tag) { Fabricate(:tag, name: "secret") }fab!(:restricted_topic, :topic)- let(:everyone) { Group::AUTO_GROUPS[:everyone] }let(:full) { TagGroupPermission.permission_types[:full] }before do@@ -139,35 +92,6 @@ RSpec.describe DiscourseRewind::Action::MostViewedTags dorestricted_topic.save!end- it "excludes tags in groups restricted to specific groups (not visible to anon)" do- tag_group = Fabricate(:tag_group, tags: [restricted_tag])- tag_group.permissions = [[group, full]]- tag_group.save!-- TopicViewItem.add(restricted_topic.id, "127.0.0.1", user.id, Date.new(2021, 3, 15))-- result = call_report- expect(result[:data].map { |t| t[:tag_id] }).not_to include(restricted_tag.id)- end-- it "includes tags in groups with everyone permission" do- tag_group = Fabricate(:tag_group, tags: [restricted_tag])- tag_group.permissions = [[everyone, full]]- tag_group.save!-- TopicViewItem.add(restricted_topic.id, "127.0.0.1", user.id, Date.new(2021, 3, 15))-- result = call_report- expect(result[:data].map { |t| t[:tag_id] }).to include(restricted_tag.id)- end-- it "includes tags not in any tag group (unrestricted)" do- TopicViewItem.add(topic_1.id, "127.0.0.1", user.id, Date.new(2021, 3, 15))-- result = call_report- expect(result[:data].map { |t| t[:tag_id] }).to include(tag_1.id)- end-it "excludes tags where user has access but anon does not" dotag_group = Fabricate(:tag_group, tags: [restricted_tag])tag_group.permissions = [[group, full]]@@ -176,9 +100,6 @@ RSpec.describe DiscourseRewind::Action::MostViewedTags doTopicViewItem.add(restricted_topic.id, "127.0.0.1", user.id, Date.new(2021, 3, 15))TopicViewItem.add(topic_1.id, "127.0.0.2", user.id, Date.new(2021, 4, 20))- expect(Tag.visible(user.guardian).pluck(:id)).to include(restricted_tag.id)- expect(Tag.visible(Guardian.new).pluck(:id)).not_to include(restricted_tag.id)-result = call_reportexpect(result[:data].map { |t| t[:tag_id] }).to contain_exactly(tag_1.id)enddiff --git a/plugins/discourse-rewind/spec/actions/reading_time_spec.rb b/plugins/discourse-rewind/spec/actions/reading_time_spec.rbindex cbb66b7aedd..50e00c0dae1 100644--- a/plugins/discourse-rewind/spec/actions/reading_time_spec.rb+++ b/plugins/discourse-rewind/spec/actions/reading_time_spec.rb@@ -1,29 +1,31 @@# frozen_string_literal: trueRSpec.describe DiscourseRewind::Action::ReadingTime do- fab!(:date) { Date.new(2021).all_year }fab!(:user)fab!(:other_user, :user)fab!(:user_visit_1) do- UserVisit.create!(- user_id: user.id,+ Fabricate(+ :user_visit,+ user: user,visited_at: Date.new(2021, 3, 10),posts_read: 5,time_read: 100,)endfab!(:user_visit_2) do- UserVisit.create!(- user_id: user.id,+ Fabricate(+ :user_visit,+ user: user,visited_at: Date.new(2021, 4, 18),posts_read: 12,time_read: 1000,)endfab!(:user_visit_3) do- UserVisit.create!(- user_id: other_user.id,+ Fabricate(+ :user_visit,+ user: other_user,visited_at: Date.new(2021, 7, 24),posts_read: 8,time_read: 1200,@@ -35,108 +37,23 @@ RSpec.describe DiscourseRewind::Action::ReadingTime doexpect(result[:data][:reading_time]).to eq(1100)end- it "matches the correct book based on reading time" do- result = call_report- expect(result[:data][:book]).to eq("The Metamorphosis")-- user_visit_1.update!(time_read: 5300 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("The Little Prince")-- user_visit_1.update!(time_read: 7100 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("Animal Farm")-- user_visit_1.update!(time_read: 10_700 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("The Alchemist")-- user_visit_1.update!(time_read: 12_500 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("The Great Gatsby")-- user_visit_1.update!(time_read: 14_900 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("Fahrenheit 451")-- user_visit_1.update!(time_read: 16_100 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("And Then There Were None")-- user_visit_1.update!(time_read: 16_700 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("1984")-- user_visit_1.update!(time_read: 17_900 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("The Catcher in the Rye")-- user_visit_1.update!(time_read: 19_640 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("The Hunger Games")-- user_visit_1.update!(time_read: 22_700 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("To Kill a Mockingbird")-- user_visit_1.update!(time_read: 24_500 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("A Tale of Two Cities")-- user_visit_1.update!(time_read: 25_100 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("Pride and Prejudice")-- user_visit_1.update!(time_read: 26_900 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("The Hobbit")-- user_visit_1.update!(time_read: 29_900 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("Little Women")-- user_visit_1.update!(time_read: 34_100 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("Jane Eyre")-- user_visit_1.update!(time_read: 37_700 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("The Da Vinci Code")-- user_visit_1.update!(time_read: 46_700 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("One Hundred Years of Solitude")-- user_visit_1.update!(time_read: 107_900 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("The Lord of the Rings")-- user_visit_1.update!(time_read: 179_900 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("The Complete works of Shakespeare")-- user_visit_1.update!(time_read: 359_900 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("The Game of Thrones Series")-- user_visit_1.update!(time_read: 719_900 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("Malazan Book of the Fallen")+ def read_for(seconds)+ user_visit_1.update!(time_read: seconds - user_visit_2.time_read)+ call_report+ end- user_visit_1.update!(time_read: 1_439_900 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("Terry Pratchett's Discworld series")+ it "picks the shortest book that takes longer than the reading time" do+ expect(read_for(3119)[:data][:book]).to eq("The Metamorphosis")+ expect(read_for(3120)[:data][:book]).to eq("The Little Prince")+ end- user_visit_1.update!(time_read: 2_159_900 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("The Wandering Inn web series")+ it "flags series" do+ expect(read_for(359_900)[:data]).to include(book: "The Game of Thrones Series", series: true)+ end- user_visit_1.update!(time_read: 2_879_900 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("The Combined Cosmere works + Wheel of Time")+ it "returns nothing when the reading time exceeds every book" do+ longest = described_class::POPULAR_BOOKS.values.pluck(:reading_time).max- user_visit_1.update!(time_read: 3_599_900 - user_visit_2.time_read)- result = call_report- expect(result[:data][:book]).to eq("The Star Trek novels")+ expect(read_for(longest)).to be_nilendenddiff --git a/plugins/discourse-rewind/spec/system/dismiss_spec.rb b/plugins/discourse-rewind/spec/system/dismiss_spec.rbindex 0f9612a964e..4cb0d0d810c 100644--- a/plugins/discourse-rewind/spec/system/dismiss_spec.rb+++ b/plugins/discourse-rewind/spec/system/dismiss_spec.rb@@ -3,6 +3,7 @@describe "DiscourseRewind | dismiss" dofab!(:user) { Fabricate(:user, created_at: DateTime.parse("2020-01-01")) }let(:rewind_page) { PageObjects::Pages::Rewind.new }+ let(:user_menu) { PageObjects::Components::UserMenu.new }before doSiteSetting.discourse_rewind_enabled = true@@ -14,7 +15,7 @@ describe "DiscourseRewind | dismiss" dorewind_page.visit_my_activityexpect(rewind_page).to have_rewind_notification_active- rewind_page.open_user_menu+ user_menu.openexpect(rewind_page).to have_calloutrewind_page.click_callout@@ -32,7 +33,7 @@ describe "DiscourseRewind | dismiss" dorewind_page.visit_my_activityexpect(rewind_page).to have_no_rewind_notification_active- rewind_page.open_user_menu+ user_menu.openexpect(rewind_page).to have_no_calloutenddiff --git a/plugins/discourse-rewind/spec/system/page_objects/pages/rewind.rb b/plugins/discourse-rewind/spec/system/page_objects/pages/rewind.rbindex 7d09d936ffb..c637f36681d 100644--- a/plugins/discourse-rewind/spec/system/page_objects/pages/rewind.rb+++ b/plugins/discourse-rewind/spec/system/page_objects/pages/rewind.rb@@ -3,11 +3,6 @@module PageObjectsmodule Pagesclass Rewind < PageObjects::Pages::Base- def visit_activity(username)- page.visit("/u/#{username}/activity")- self- end-def visit_my_activitypage.visit("/my/activity")self@@ -29,34 +24,6 @@ module PageObjectshas_no_css?("body.rewind-notification-active")end- def has_rewind_header_icon?- has_css?(".rewind-header-icon")- end-- def has_no_rewind_header_icon?- has_no_css?(".rewind-header-icon")- end-- def click_rewind_header_icon- find(".rewind-header-icon").click- end-- def click_header_tooltip_cta- find(".rewind-header-icon-tooltip-content .rewind-header-icon__button").click- end-- def click_header_tooltip_preferences_link- find(".rewind-header-icon-tooltip-content .rewind-header-icon__preferences a").click- end-- def open_user_menu- find("#toggle-current-user").click- end-- def click_profile_tab- click_link("user-menu-button-profile")- end-def has_callout?has_css?(".rewind-callout__container")end@@ -69,14 +36,6 @@ module PageObjectsfind(".rewind-callout__container .rewind-callout").clickend- def has_rewind_header?- has_css?(".rewind .rewind__header")- end-- def on_rewind_page?(username)- has_current_path?("/u/#{username}/activity/rewind")- end-def has_rewind_profile_link?has_css?("#quick-access-profile a[href*='/activity/rewind']")enddiff --git a/plugins/discourse-rewind/spec/system/user_preferences_spec.rb b/plugins/discourse-rewind/spec/system/user_preferences_spec.rbindex bc88be960dc..c0a9f6328d6 100644--- a/plugins/discourse-rewind/spec/system/user_preferences_spec.rb+++ b/plugins/discourse-rewind/spec/system/user_preferences_spec.rb@@ -3,6 +3,7 @@describe "DiscourseRewind | user preferences" dofab!(:current_user) { Fabricate(:user, created_at: DateTime.parse("2020-01-01")) }let(:rewind_page) { PageObjects::Pages::Rewind.new }+ let(:user_menu) { PageObjects::Components::UserMenu.new }before doSiteSetting.discourse_rewind_enabled = true@@ -18,13 +19,6 @@ describe "DiscourseRewind | user preferences" doexpect(rewind_page).to have_rewind_tabend- it "shows the rewind profile link" do- rewind_page.visit_my_activity- rewind_page.open_user_menu- rewind_page.click_profile_tab- expect(rewind_page).to have_rewind_profile_link- end-it "shows the rewind preferences nav link" dorewind_page.visit_my_preferencesexpect(rewind_page).to have_rewind_preferences_nav@@ -41,8 +35,7 @@ describe "DiscourseRewind | user preferences" doit "does not show the rewind profile link" dorewind_page.visit_my_activity- rewind_page.open_user_menu- rewind_page.click_profile_tab+ user_menu.open.click_profile_tabexpect(rewind_page).to have_no_rewind_profile_linkendend