- <% @article.collection.articles.order("collection_position ASC").each_with_index do |article,i| %>
+ <% @collection.articles.where(published: true).order("published_at ASC").each_with_index do |article,i| %>
"
data-organization="<%= @organization&.to_json(only: [:name, :bg_color_hex, :text_color_hex], methods: [:profile_image_90]) %>"
>
diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb
index fe17df223..fc92ebba9 100644
--- a/app/views/articles/show.html.erb
+++ b/app/views/articles/show.html.erb
@@ -164,7 +164,9 @@
<%= @article.processed_html.html_safe %>
- <%= render "articles/collection", position: "bottom" %>
+ <% if @article.body_markdown && @article.body_markdown.size > 900 %>
+ <%= render "articles/collection", position: "bottom" %>
+ <% end %>
<%= render 'articles/actions' %>
<% if @article.body_markdown && @article.body_markdown.size > 900 %>
diff --git a/lib/tasks/fetch.rake b/lib/tasks/fetch.rake
index 291dca77e..7605f39b6 100644
--- a/lib/tasks/fetch.rake
+++ b/lib/tasks/fetch.rake
@@ -96,7 +96,8 @@ task remove_old_html_variant_data: :environment do
HtmlVariantTrial.where("created_at < ?", 1.week.ago).destroy_all
HtmlVariantSuccess.where("created_at < ?", 1.week.ago).destroy_all
HtmlVariant.find_each do |html_variant|
- return if html_variant.html_variant_successes.size < 12
+ if html_variant.html_variant_successes.size > 3
html_variant.calculate_success_rate!
+ end
end
end
diff --git a/spec/models/article_spec.rb b/spec/models/article_spec.rb
index 5407331f7..3da93cab3 100644
--- a/spec/models/article_spec.rb
+++ b/spec/models/article_spec.rb
@@ -473,5 +473,17 @@ RSpec.describe Article, type: :model do
last_year = 1.year.ago.year % 100
expect(article.readable_publish_date.include?("'#{last_year}")).to eq(true)
end
+
+ it "is valid as part of a collection" do
+ collection = Collection.create(user_id: article.user.id, slug: "yoyoyo")
+ article.collection_id = collection.id
+ expect(article).to be_valid
+ end
+
+ it "is not valid as part of a collection that does not belong to user" do
+ collection = Collection.create(user_id: 32443, slug: "yoyoyo")
+ article.collection_id = collection.id
+ expect(article).not_to be_valid
+ end
end
# rubocop:enable RSpec/ExampleLength, RSpec/MultipleExpectations
diff --git a/spec/requests/articles_api_spec.rb b/spec/requests/articles_api_spec.rb
index bac52abcf..66f36d4a3 100644
--- a/spec/requests/articles_api_spec.rb
+++ b/spec/requests/articles_api_spec.rb
@@ -67,4 +67,70 @@ RSpec.describe "ArticlesApi", type: :request do
expect(JSON.parse(response.body)["title"]).to eq(article.title)
end
end
+
+ describe "POST /api/articles w/ current_user" do
+ before do
+ sign_in user1
+ end
+ it "creates ordinary article with proper params" do
+ new_title = "NEW TITLE #{rand(100)}"
+ post "/api/articles", params: {
+ article: { title: new_title, body_markdown: "Yo ho ho#{rand(100)}", tag_list: "yo" }
+ }
+ expect(Article.last.user_id).to eq(user1.id)
+ end
+ # rubocop:disable RSpec/ExampleLength
+ it "creates article with front matter params" do
+ post "/api/articles", params: {
+ article: {
+ body_markdown: "---\ntitle: hey hey hahuu\npublished: false\n---\nYo ho ho#{rand(100)}",
+ tag_list: "yo"
+ }
+ }
+ expect(Article.last.title).to eq("hey hey hahuu")
+ end
+ it "creates article w/ series param" do
+ new_title = "NEW TITLE #{rand(100)}"
+ post "/api/articles", params: {
+ article: { title: new_title,
+ body_markdown: "Yo ho ho#{rand(100)}",
+ tag_list: "yo",
+ series: "helloyo",
+ }
+ }
+ expect(Article.last.collection).to eq(Collection.find_by_slug("helloyo"))
+ expect(Article.last.collection.user_id).to eq(Article.last.user_id)
+ end
+ it "creates article with front matter params" do
+ post "/api/articles", params: {
+ article: {
+ body_markdown: "---\ntitle: hey hey hahuu\npublished: false\nseries: helloyo\n---\nYo ho ho#{rand(100)}",
+ tag_list: "yo"
+ }
+ }
+ expect(Article.last.collection).to eq(Collection.find_by_slug("helloyo"))
+ expect(Article.last.collection.user_id).to eq(Article.last.user_id)
+ end
+ end
+
+ describe "PUT /api/articles/:id w/ current_user" do
+ before do
+ sign_in user1
+ @article = create(:article, user: user1)
+ end
+ it "updates ordinary article with proper params" do
+ new_title = "NEW TITLE #{rand(100)}"
+ put "/api/articles/#{@article.id}", params: {
+ article: { title: new_title, body_markdown: "Yo ho ho#{rand(100)}", tag_list: "yo" }
+ }
+ expect(Article.last.title).to eq(new_title)
+ end
+ it "updates ordinary article with proper params" do
+ new_title = "NEW TITLE #{rand(100)}"
+ put "/api/articles/#{@article.id}", params: {
+ article: { title: new_title, body_markdown: "Yo ho ho#{rand(100)}", tag_list: "yo" }
+ }
+ expect(Article.last.title).to eq(new_title)
+ end
+ end
end
diff --git a/spec/requests/articles_create_spec.rb b/spec/requests/articles_create_spec.rb
index 4df62ffe8..8ff304649 100644
--- a/spec/requests/articles_create_spec.rb
+++ b/spec/requests/articles_create_spec.rb
@@ -50,5 +50,16 @@ RSpec.describe "ArticlesCreate", type: :request do
}
expect(Article.last.job_opportunity.remoteness).to eq("on_premise")
end
+
+ it "creates series when series is created with frontmatter" do
+ new_title = "NEW TITLE #{rand(100)}"
+ post "/articles", params: {
+ article: {
+ title: new_title,
+ body_markdown: "---\ntitle: hey hey hahuu\npublished: false\nseries: helloyo\n---\nYo ho ho#{rand(100)}",
+ }
+ }
+ expect(Collection.last.slug).to eq("helloyo")
+ end
# rubocop:enable RSpec/ExampleLength
end