diff --git a/app/controllers/chat_channels_controller.rb b/app/controllers/chat_channels_controller.rb index d4e5ccf10..3de57427f 100644 --- a/app/controllers/chat_channels_controller.rb +++ b/app/controllers/chat_channels_controller.rb @@ -75,12 +75,6 @@ class ChatChannelsController < ApplicationController render "index.json" end - def render_additional_json_response - @chat_channels_memberships = current_user. - chat_channel_memberships.includes(:chat_channel).limit(200).order("updated_at DESC") - render "index.json" - end - def render_channels_html return unless current_user if params[:slug] diff --git a/app/views/events/_event.html.erb b/app/views/events/_event.html.erb index bf1707614..c862e259d 100644 --- a/app/views/events/_event.html.erb +++ b/app/views/events/_event.html.erb @@ -50,7 +50,7 @@
- +

<%= event.category %>: <%= event.title %>

diff --git a/app/views/pages/about.html.erb b/app/views/pages/about.html.erb index c89fcee4e..2c9ca7ce1 100644 --- a/app/views/pages/about.html.erb +++ b/app/views/pages/about.html.erb @@ -23,6 +23,31 @@ + +
@@ -37,8 +62,39 @@ Where programmers share ideas and help each other grow. It is an online community for sharing and discovering great ideas, having debates, and making friends. Anyone can share articles, questions, discussions, etc. as long as they have the rights to the words they are sharing. Cross-posting from your own blog is welcome.

Leadership

- - +
+
+
+ " width="250" alt="Ben Halpern"/> +
+
+ Ben Halpern, Founder
+ Ben manages content, is the core maintainer of the dev.to application, and makes jokes on the Internets. +
+
+
+
+ " width="250" alt="Ben Halpern"/> +
+
+ Jess Lee, Co-Founder
+ Jess leads day-to-day operations, manages content, and contributes to the dev.to codebase. +
+
+
+
+ " width="250" alt="Ben Halpern"/> +
+
+ Peter Frank, Co-Founder
+ Peter focuses on strategy, investor relations, and sending dev.to swag around the globe. +
+
+
+ +

The platform was created in 2016. The Twitter account, @ThePracticalDev was around before then. We are based out of New York City.

diff --git a/spec/requests/chat_channels_spec.rb b/spec/requests/chat_channels_spec.rb index e0cc6e282..4e2027773 100644 --- a/spec/requests/chat_channels_spec.rb +++ b/spec/requests/chat_channels_spec.rb @@ -4,6 +4,8 @@ RSpec.describe "ChatChannels", type: :request do let(:user) { create(:user) } let(:test_subject) { create(:user) } let(:chat_channel) { create(:chat_channel) } + let(:invite_channel) { create(:chat_channel, channel_type: "invite_only") } + let(:direct_channel) { create(:chat_channel, channel_type: "direct", slug: "hello/#{user.username}") } before do sign_in user @@ -20,6 +22,31 @@ RSpec.describe "ChatChannels", type: :request do expect(response.body).to include("DEV Connect is Beta ") end end + + context "logged in, visiting existing channel" do + before do + invite_channel.add_users [user] + sign_in user + get "/connect/#{invite_channel.slug}" + end + + it "has proper content" do + expect(response.body).to include("DEV Connect is Beta ") + end + end + end + + describe "get /chat_channels?state=unopened" do + it "returns unopened channels" do + direct_channel.add_users [user] + user.chat_channel_memberships.each do |m| + m.has_unopened_messages = true + m.save + end + sign_in user + get "/chat_channels?state=unopened" + expect(response.body).to include(direct_channel.slug) + end end describe "GET /chat_channels/:id" do