Browse Source

correct a small typo and remove a duplicated method after clever git merge conflict suggestion

pull/1268/head
Arthur Campbell 3 years ago
parent
commit
33512fc0f6
  1. 4
      app/models/lettings_log.rb
  2. 2
      spec/features/form/accessible_autocomplete_spec.rb
  3. 2
      spec/features/form/progressive_total_field_spec.rb

4
app/models/lettings_log.rb

@ -481,10 +481,6 @@ class LettingsLog < Log
form.get_question("rent_type", self)&.label_from_value(rent_type)
end
def lettings?
true
end
def non_location_setup_questions_completed?
[needstype, renewal, rent_type, startdate, owning_organisation_id, created_by_id].all?(&:present?)
end

2
spec/features/form/accessible_autocomplete_spec.rb

@ -1,7 +1,7 @@
require "rails_helper"
require_relative "helpers"
RSpec.describe "Accessible Automcomplete" do
RSpec.describe "Accessible Autocomplete" do
include Helpers
let(:user) { FactoryBot.create(:user) }
let(:lettings_log) do

2
spec/features/form/progressive_total_field_spec.rb

@ -1,7 +1,7 @@
require "rails_helper"
require_relative "helpers"
RSpec.describe "Accessible Automcomplete" do
RSpec.describe "Accessible Autocomplete" do
include Helpers
let(:user) { FactoryBot.create(:user) }
let(:lettings_log) do

Loading…
Cancel
Save