fixed tests

Author: noahnizamian

app/controllers/session_controller.rb

@@ -115,7 +115,7 @@ def update_user_credential(user, token)
       )
     else
       user.lms_credentials.create!(
-        lms_name: 'canvas',
+        lms_id: 1,
         token: token.token,
         refresh_token: token.refresh_token,
         expire_time: Time.zone.at(token.expires_at)

app/models/lms_credential.rb

@@ -26,10 +26,11 @@
 class LmsCredential < ApplicationRecord
   # Belongs to a User
   belongs_to :user
+  belongs_to :lms, optional: true
 
   # Encryption for tokens
   encrypts :token, :refresh_token
 
   # LMS must exist
-  validates :lms_name, presence: true
+  validates :lms_id, presence: true
 end

app/models/user.rb

@@ -38,9 +38,8 @@ class User < ApplicationRecord
   has_many :user_to_courses
   has_many :courses, through: :user_to_courses
 
-  # TODO: We should probably use lms_id over lms_name
   def canvas_credentials
-    lms_credentials.find_by(lms_name: 'canvas')
+    lms_credentials.find_by(lms_id: 1)
   end
 
   def token_expired?

features/step_definitions/student_notes_steps.rb

@@ -1,5 +1,5 @@
-# Click "Show" link for a request by assignment name
-When(/^I click "Show" for the request for "([^"]*)"$/) do |assignment_name|
+# Navigate to the request show page for a given assignment
+When(/^I view the request for "([^"]*)"$/) do |assignment_name|
   request = Request.joins(:assignment).find_by(assignments: { name: assignment_name })
   raise "No request found for assignment #{assignment_name}" unless request
 

features/student_notes.feature

@@ -13,8 +13,7 @@ Scenario: Teacher sees notes section on request detail page
     And I fill in "request[reason]" with "Need more time"
     And I press "Submit Request"
     Then I log in as a Teacher
-    And I go to the Requests page
-    And I click "Show" for the request for "Homework 1"
+    And I view the request for "Homework 1"
     Then I should see "Staff Notes for"
     And I should see "No notes yet."
 
@@ -26,8 +25,7 @@ Scenario: Teacher can save notes for a student
     And I press "Submit Request"
     Then I log in as a Teacher
     And the student for the course has notes "Student has DSP accommodations."
-    And I go to the Requests page
-    And I click "Show" for the request for "Homework 1"
+    And I view the request for "Homework 1"
     Then I should see "Student has DSP accommodations."
 
 Scenario: Student does not see staff notes on their request page
@@ -37,7 +35,7 @@ Scenario: Student does not see staff notes on their request page
     And I fill in "request[reason]" with "Need more time"
     And I press "Submit Request"
     Given the student for the course has notes "Internal staff note"
-    And I go to the Course page
-    And I follow "Show"
+    And I go to the Requests page
+    And I click View for "Homework 1" in the "requests-table"
     Then I should not see "Staff Notes for"
     And I should not see "Internal staff note"

spec/controllers/application_controller_spec.rb

@@ -15,7 +15,7 @@ def test_auth
   let(:user) do
     User.create!(email: 'test@example.com', canvas_uid: '123').tap do |u|
       u.lms_credentials.create!(
-        lms_name: 'canvas',
+        lms_id: 1,
         token: 'valid_token',
         refresh_token: 'refresh_token',
         expire_time: 1.hour.from_now

spec/controllers/concerns/token_refreshable_spec.rb

@@ -22,7 +22,7 @@ def current_user
   let(:user) do
     User.create!(email: 'test@example.com', canvas_uid: '123').tap do |u|
       u.lms_credentials.create!(
-        lms_name: 'canvas',
+        lms_id: 1,
         token: 'valid_token',
         refresh_token: 'refresh_token',
         expire_time: 10.minutes.from_now

spec/controllers/course_settings_controller_spec.rb

@@ -7,7 +7,7 @@
 
   before do
     instructor.lms_credentials.create!(
-      lms_name: 'canvas',
+      lms_id: 1,
       token: 'fake_token',
       refresh_token: 'fake_refresh_token',
       expire_time: 1.hour.from_now
@@ -190,7 +190,7 @@
     before do
       session[:user_id] = student.canvas_uid
       student.lms_credentials.create!(
-        lms_name: 'canvas',
+        lms_id: 1,
         token: 'student_token',
         refresh_token: 'student_refresh_token',
         expire_time: 1.hour.from_now

spec/controllers/courses_controller_spec.rb

@@ -11,7 +11,7 @@
     session[:user_id] = user.canvas_uid
     UserToCourse.create!(user: user, course: course, role: 'student')
     user.lms_credentials.create!(
-      lms_name: 'canvas',
+      lms_id: 1,
       token: 'fake_token',
       refresh_token: 'fake_refresh_token',
       expire_time: 1.hour.from_now
@@ -118,7 +118,7 @@
   describe 'GET #new' do
     before do
       # Create a fake LMS credential with a token
-      user.lms_credentials.create!(lms_name: 'canvas', token: 'fake_token', expire_time: 1.hour.from_now)
+      user.lms_credentials.create!(lms_id: 1, token: 'fake_token', expire_time: 1.hour.from_now)
 
       allow(Course).to receive(:fetch_courses).and_return([
                                                             {
@@ -167,7 +167,7 @@
   describe 'GET #enrollments' do
     before do
       # Create LMS credentials so user has a token
-      user.lms_credentials.create!(lms_name: 'canvas', token: 'fake_token', expire_time: 1.hour.from_now)
+      user.lms_credentials.create!(lms_id: 1, token: 'fake_token', expire_time: 1.hour.from_now)
 
       # Add user as a teacher so they are allowed to view enrollments
       UserToCourse.create!(user: user, course: course, role: 'teacher')

spec/controllers/requests_controller_spec.rb

@@ -1,8 +1,8 @@
 require 'rails_helper'
 
 RSpec.describe RequestsController, type: :controller do
-  let(:user) { User.create!(email: 'student@example.com', canvas_uid: '123', name: 'Student') }
-  let(:instructor) { User.create!(email: 'instructor@example.com', canvas_uid: '566', name: 'Instructor') }
+  let(:user) { User.create!(email: 'student@example.com', canvas_uid: 'student-uid-123', name: 'Student') }
+  let(:instructor) { User.create!(email: 'instructor@example.com', canvas_uid: 'instructor-uid-566', name: 'Instructor') }
   let(:course) { create(:course, :with_staff, course_name: 'Test Course', canvas_id: '456', course_code: 'TST101') }
   let(:teacher_course) { Course.create!(course_name: 'Instructor Course', canvas_id: '999', course_code: 'INST101') }
   let(:assignment) do
@@ -29,7 +29,7 @@
     CourseToLms.create!(course:, lms_id: 1)
 
     user.lms_credentials.create!(
-      lms_name: 'canvas',
+      lms_id: 1,
       token: 'fake_token',
       refresh_token: 'fake_refresh_token',
       expire_time: 1.hour.from_now
@@ -83,7 +83,7 @@
       session[:user_id] = instructor.canvas_uid
       UserToCourse.create!(user: instructor, course: course, role: 'teacher')
       instructor.lms_credentials.create!(
-        lms_name: 'canvas',
+        lms_id: 1,
         token: 'fake_token',
         refresh_token: 'fake_refresh_token',
         expire_time: 1.hour.from_now
@@ -334,7 +334,7 @@
       session[:user_id] = instructor.canvas_uid
       UserToCourse.create!(user: instructor, course: course, role: 'teacher')
       instructor.lms_credentials.create!(
-        lms_name: 'canvas',
+        lms_id: 1,
         token: 'instructor_token',
         refresh_token: 'instructor_refresh',
         expire_time: 1.hour.from_now
@@ -461,7 +461,7 @@
       session[:user_id] = instructor.canvas_uid
       UserToCourse.create!(user: instructor, course: course, role: 'teacher')
       instructor.lms_credentials.create!(
-        lms_name: 'canvas',
+        lms_id: 1,
         token: 'instructor_token',
         refresh_token: 'instructor_refresh',
         expire_time: 1.hour.from_now
@@ -692,7 +692,7 @@
 
       # Create credentials for user
       user.lms_credentials.create!(
-        lms_name: 'canvas',
+        lms_id: 1,
         token: 'fake_token',
         refresh_token: 'fake_refresh_token',
         expire_time: 1.hour.from_now