adds minimally functional page for assistant instructions (#45)

AllYourBot · Jan 11, 2024 · f750820 · f750820
1 parent 273b00c
commit f750820
Show file tree

Hide file tree

Showing 17 changed files with 102 additions and 8 deletions.
diff --git a/app/controllers/assistants/instructions_controller.rb b/app/controllers/assistants/instructions_controller.rb
@@ -0,0 +1,21 @@
+class Assistants::InstructionsController < ApplicationController
+  before_action :set_assistant
+
+  def edit
+  end
+
+  def update
+    @assistant.update!(assistant_params)
+    redirect_to @assistant, notice: "Instructions have been saved."
+  end
+
+  private
+
+  def set_assistant
+    @assistant = Assistant.find(params[:assistant_id])
+  end
+
+  def assistant_params
+    params.require(:assistant).permit(:instructions)
+  end
+end
diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep
diff --git a/app/views/assistants/instructions/edit.html.erb b/app/views/assistants/instructions/edit.html.erb
@@ -0,0 +1,7 @@
+Your assistant <%= @assistant.name %> has the following instructions:
+
+<%= form_for @assistant, url: assistant_instructions_path(@assistant) do |f| %>
+  <%= f.text_area :instructions, rows: 10, class: "w-auto mx-20" %>
+  <br>
+  <%= f.submit "Update", class: "bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded" %>
+<% end %>
diff --git a/app/views/assistants/show.html.erb b/app/views/assistants/show.html.erb
@@ -1,8 +1,5 @@
 <div class="mx-auto md:w-2/3 w-full flex">
   <div class="mx-auto">
-    <% if notice.present? %>
-      <p class="py-2 px-3 bg-green-50 mb-5 text-green-500 font-medium rounded-lg inline-block" id="notice"><%= notice %></p>
-    <% end %>
 
     <%= render @assistant %>
 

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -19,6 +19,9 @@
     <%= content_for :head %>
   </head>
   <body>
+    <% if notice.present? %>
+      <p class="py-2 px-3 bg-green-50 mb-5 text-green-500 font-medium rounded-lg inline-block" id="notice"><%= notice %></p>
+    <% end %>
     <%= yield %>
   </body>
 </html>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
@@ -3,7 +3,7 @@
   <h2 class='text-3xl font-semibold text-black/90'>Welcome back</h2>
     <%= form_with(url: login_path, method: :post, class: "flex flex-col space-y-4 w-80") do |f| %>
     <%= f.email_field :email, id: "email", autofocus: true, placeholder: "Email address", class: "border border-gray-400 rounded text-black p-3"%>
-    <%= f.password_field :password, id: "email", autofocus: true, placeholder: "Password", class: "border border-gray-400 rounded text-black p-3"%>
+    <%= f.password_field :password, id: "password", autofocus: true, placeholder: "Password", class: "border border-gray-400 rounded text-black p-3"%>
     <%= f.submit "Continue", class: 'bg-teal-600 hover:bg-teal-700 rounded-sm font-light text-white p-4 px-4 text-center' %>
     <span class='text-sm text-center'>Don't have an account ? <a href="/register" class='text-teal-600'>Sign up</a></span>
     <% end %>

diff --git a/config/puma.rb b/config/puma.rb
@@ -33,5 +33,3 @@
 
 # Allow puma to be restarted by `bin/rails restart` command.
 plugin :tmp_restart
-
-plugin :solid_queue
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,5 +1,9 @@
 Rails.application.routes.draw do
-  resources :assistants
+  resources :assistants do
+    get :instructions, to: "assistants/instructions#edit"
+    patch :instructions, to: "assistants/instructions#update"
+  end
+
   resources :conversations
   resources :messages
   resources :documents

diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
@@ -2,4 +2,14 @@
 
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
   driven_by :selenium, using: :headless_chrome, screen_size: [1400, 1400]
+
+  fixtures :all
+
+  def login_as(user, password = "secret")
+    visit login_path
+    fill_in "email", with: user.person.email
+    fill_in "password", with: password
+    click_on "Continue"
+    assert_text "Successfully logged in."
+  end
 end
diff --git a/test/controllers/.keep b/test/controllers/.keep
diff --git a/test/controllers/assistants/instructions_controller_test.rb b/test/controllers/assistants/instructions_controller_test.rb
@@ -0,0 +1,22 @@
+require "test_helper"
+
+class Assistants::InstructionsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @assistant = assistants(:samantha)
+    login_as assistants(:samantha).user
+  end
+
+  test "it shows the instructions" do
+    get assistant_instructions_url(@assistant)
+    assert_response :success
+  end
+
+  test "it updates the instructions" do
+    new_instructions = "New instructions"
+    patch assistant_instructions_url(@assistant), params: {assistant: {instructions: new_instructions }}
+    assert_redirected_to assistant_url(@assistant)
+
+    @assistant.reload
+    assert_equal new_instructions, @assistant.instructions
+  end
+end
diff --git a/test/fixtures/chats.yml b/test/fixtures/chats.yml
@@ -0,0 +1,2 @@
+chat_with_samantha:
+  user: keith
diff --git a/test/fixtures/notes.yml b/test/fixtures/notes.yml
@@ -0,0 +1,3 @@
+note_from_samantha:
+  chat: chat_with_samantha
+  content: Hi, how are you?
diff --git a/test/models/.keep b/test/models/.keep
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
@@ -10,7 +10,7 @@ class UserTest < ActiveSupport::TestCase
     person = Person.new(email: "[email protected]", personable: user)
     assert_raises(ActiveRecord::RecordInvalid) { person.save! }
   end
-  j
+
   test "should not save user without password confirmation" do
     user = User.new(password: "password")
     person = Person.new(email: "[email protected]", personable: user)
@@ -22,4 +22,9 @@ class UserTest < ActiveSupport::TestCase
     person = Person.new(email: "[email protected]", personable: user)
     assert person.save!
   end
+
+  test "it can validate a password" do
+    user = users(:keith)
+    assert user.authenticate("secret")
+  end
 end
diff --git a/test/system/assistants/instructions_test.rb b/test/system/assistants/instructions_test.rb
@@ -0,0 +1,17 @@
+require "application_system_test_case"
+
+class AssistantsInstructionsTest < ApplicationSystemTestCase
+  setup do
+    @assistant = assistants(:samantha)
+  end
+
+  test "should update Assistant" do
+    login_as @assistant.user
+    visit assistant_instructions_url(@assistant)
+
+    fill_in "assistant[instructions]", with: "Updated Instructions"
+    click_on "Update"
+
+    assert_text "Instructions have been saved."
+  end
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -50,6 +50,11 @@ class ActionDispatch::IntegrationTest
   def response
     JSON.parse(@response.body, object_class: OpenStruct)&.data
   end
+
+  def login_as(user)
+    post login_path, params: { email: user.person.email, password: "secret" }
+    assert_redirected_to dashboard_path
+  end
 end
 
 module ActiveSupport
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,5 +33,3 @@

		# Allow puma to be restarted by `bin/rails restart` command.
		plugin :tmp_restart

		plugin :solid_queue