Apply rubcop and get tests pass (#76)

config/routes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 CustomWizard::Engine.routes.draw do
   get ':wizard_id' => 'wizard#index'
   put ':wizard_id/skip' => 'wizard#skip'

controllers/custom_wizard/admin/admin.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::AdminController < ::Admin::AdminController
   before_action :ensure_admin
 

controllers/custom_wizard/admin/api.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::AdminApiController < CustomWizard::AdminController
   skip_before_action :check_xhr, only: [:redirect]
 
@@ -85,7 +86,7 @@ class CustomWizard::AdminApiController < CustomWizard::AdminController
     CustomWizard::Api::Authorization.set(params[:name], code: params[:code])
     CustomWizard::Api::Authorization.get_token(params[:name])
 
-    return redirect_to path('/admin/wizards/apis/' + params[:name])
+    redirect_to path('/admin/wizards/apis/' + params[:name])
   end
 
   private

controllers/custom_wizard/admin/custom_fields.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::AdminCustomFieldsController < CustomWizard::AdminController
   def index
     render_json_dump(custom_field_list)

controllers/custom_wizard/admin/logs.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::AdminLogsController < CustomWizard::AdminController
   def index
     render_serialized(

controllers/custom_wizard/admin/manager.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::AdminManagerController < CustomWizard::AdminController
   skip_before_action :check_xhr, only: [:export]
   before_action :get_wizard_ids, except: [:import]

controllers/custom_wizard/admin/submissions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::AdminSubmissionsController < CustomWizard::AdminController
   skip_before_action :preload_json, :check_xhr, only: [:download]
   before_action :find_wizard, except: [:index]

controllers/custom_wizard/admin/wizard.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::AdminWizardController < CustomWizard::AdminController
   before_action :find_wizard, only: [:show, :remove]
 

controllers/custom_wizard/steps.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::StepsController < ::ApplicationController
   before_action :ensure_logged_in
   before_action :ensure_can_update

controllers/custom_wizard/wizard.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::WizardController < ::ApplicationController
   prepend_view_path(Rails.root.join('plugins', 'discourse-custom-wizard', 'views'))
   layout 'wizard'

db/migrate/20200718014105_update_watch_categories_action.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class UpdateWatchCategoriesAction < ActiveRecord::Migration[6.0]
   def change
     watch_category_wizards = PluginStoreRow.where("

extensions/custom_field/preloader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CustomWizardCustomFieldPreloader
   def preload_custom_fields(objects, fields)
     if objects.present? && cw_fields_enabled?

extensions/custom_field/serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CustomWizardCustomFieldSerializer
   def attributes(*args)
     hash = super

extensions/extra_locales_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ExtraLocalesControllerCustomWizard
   private def valid_bundle?(bundle)
     super || begin

extensions/invites_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module InvitesControllerCustomWizard
   def path(url)
     if ::Wizard.user_requires_completion?(@user)

extensions/users_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CustomWizardUsersController
   def account_created
     if current_user.present? &&

extensions/wizard_field.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CustomWizardFieldExtension
   attr_reader :raw,
               :label,

extensions/wizard_step.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CustomWizardStepExtension
   attr_accessor :title, :description, :key, :permitted, :permitted_message
 end

jobs/clear_after_time_wizard.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Jobs
   class ClearAfterTimeWizard < ::Jobs::Base
     sidekiq_options queue: 'critical'

jobs/refresh_api_access_token.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Jobs
   class RefreshApiAccessToken < ::Jobs::Base
     def execute(args)

jobs/set_after_time_wizard.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Jobs
   class SetAfterTimeWizard < ::Jobs::Base
     def execute(args)

lib/custom_wizard/action.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::Action
   attr_accessor :data,
                 :action,
@@ -465,7 +466,6 @@ class CustomWizard::Action
           name = keyArr.first
         end
 
-        
         registered = registered_fields.select { |f| f[:name] == name }
         if registered.first.present?
           klass = registered.first[:klass]
@@ -712,7 +712,7 @@ class CustomWizard::Action
 
     if @log.any?
       @log.each do |item|
-        log << "; #{item.to_s}"
+        log += "; #{item.to_s}"
       end
     end
 

lib/custom_wizard/action_result.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::ActionResult
   attr_accessor :success, :handler, :output
 

lib/custom_wizard/api/api.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::Api
   include ActiveModel::SerializerSupport
 

lib/custom_wizard/api/authorization.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'excon'
 
 class CustomWizard::Api::Authorization
@@ -106,11 +107,11 @@ class CustomWizard::Api::Authorization
 
     connection = Excon.new(
       authorization.token_url,
-      :headers => {
+      headers: {
         "Content-Type" => "application/x-www-form-urlencoded"
       },
-      :method => 'GET',
+      method: 'GET',
-      :query => URI.encode_www_form(body)
+      query: URI.encode_www_form(body)
     )
     begin
       result = connection.request()

lib/custom_wizard/api/endpoint.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::Api::Endpoint
   include ActiveModel::SerializerSupport
 

lib/custom_wizard/api/log_entry.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::Api::LogEntry
   include ActiveModel::SerializerSupport
 

lib/custom_wizard/builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::Builder
   attr_accessor :wizard, :updater, :submissions
 
@@ -125,7 +126,7 @@ class CustomWizard::Builder
 
             if final_step
               if @wizard.id == @wizard.user.custom_fields['redirect_to_wizard']
-                @wizard.user.custom_fields.delete('redirect_to_wizard');
+                @wizard.user.custom_fields.delete('redirect_to_wizard')
                 @wizard.user.save_custom_fields(true)
               end
 

lib/custom_wizard/custom_field.rb

@@ -90,7 +90,6 @@ class ::CustomWizard::CustomField
         add_error(I18n.t("#{i18n_key}.unsupported_type", type: value))
       end
 
-      
       if attr == 'name'
         unless value.is_a?(String)
           add_error(I18n.t("#{i18n_key}.name_invalid", name: value))

lib/custom_wizard/field.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::Field
   def self.types
     @types ||= {

lib/custom_wizard/log.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::Log
   include ActiveModel::Serialization
 

lib/custom_wizard/mapper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::Mapper
   attr_accessor :inputs, :data, :user
 

lib/custom_wizard/realtime_validations/result.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::RealtimeValidation::Result
   attr_accessor :type,
                 :items,

lib/custom_wizard/realtime_validations/similar_topics.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::RealtimeValidation::SimilarTopics
   attr_accessor :user
 

lib/custom_wizard/step_updater.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::StepUpdater
   include ActiveModel::Model
 

lib/custom_wizard/validators/template.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::TemplateValidator
   include HasErrors
   include ActiveModel::Model

lib/custom_wizard/validators/update.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'addressable/uri'
 
 class ::CustomWizard::UpdateValidator

lib/custom_wizard/wizard.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_dependency 'wizard/step'
 require_dependency 'wizard/field'
 require_dependency 'wizard/step_updater'
@@ -177,7 +178,7 @@ class CustomWizard::Wizard
   def can_access?
     return false unless user
     return true if user.admin
-    return permitted? && (multiple_submissions || !completed?)
+    permitted? && (multiple_submissions || !completed?)
   end
 
   def reset

plugin.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # name: discourse-custom-wizard
 # about: Create custom wizards
 # version: 0.7.0

serializers/custom_wizard/api/authorization_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::Api::AuthorizationSerializer < ::ApplicationSerializer
   attributes :auth_type,
              :auth_url,

serializers/custom_wizard/api/basic_endpoint_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::Api::BasicEndpointSerializer < ::ApplicationSerializer
   attributes :id,
              :name

serializers/custom_wizard/api/endpoint_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::Api::EndpointSerializer < ::ApplicationSerializer
   attributes :id,
              :name,

serializers/custom_wizard/api/log_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::Api::LogSerializer < ::ApplicationSerializer
   attributes :log_id,
              :time,

serializers/custom_wizard/api_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::ApiSerializer < ::ApplicationSerializer
   attributes :name,
              :title,

serializers/custom_wizard/basic_api_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::BasicApiSerializer < ::ApplicationSerializer
   attributes :name,
              :title,

serializers/custom_wizard/basic_wizard_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::BasicWizardSerializer < ::ApplicationSerializer
   attributes :id, :name
 end

serializers/custom_wizard/custom_field_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::CustomFieldSerializer < ApplicationSerializer
   attributes :id, :klass, :name, :type, :serializers
 end

serializers/custom_wizard/log_serializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CustomWizard::LogSerializer < ApplicationSerializer
   attributes :message, :date
 end

serializers/custom_wizard/realtime_validation/similar_topics_serializer.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 class ::CustomWizard::RealtimeValidation::SimilarTopicsSerializer < ::SimilarTopicSerializer
 end

spec/components/custom_wizard/builder_spec.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative '../../plugin_helper'
 
 describe CustomWizard::Builder do

spec/components/custom_wizard/field_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../plugin_helper'
 
 describe CustomWizard::Field do

spec/components/custom_wizard/log_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../plugin_helper'
 
 describe CustomWizard::Log do

spec/components/custom_wizard/mapper_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../plugin_helper'
 
 describe CustomWizard::Mapper do
@@ -86,6 +87,8 @@ describe CustomWizard::Mapper do
 
     it "does not map when one of multiple conditions are not met" do
       user1.email = "angus@other-email.com"
+      user1.save
+      
       expect(CustomWizard::Mapper.new(
         inputs: inputs['conditional_multiple_pairs'],
         data: data,

spec/components/custom_wizard/template_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../plugin_helper'
 
 describe CustomWizard::Template do

spec/components/custom_wizard/template_validator_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../plugin_helper'
 
 describe CustomWizard::TemplateValidator do

spec/components/custom_wizard/update_validator_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../plugin_helper'
 
 describe CustomWizard::UpdateValidator do

spec/components/custom_wizard/wizard_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../plugin_helper'
 
 describe CustomWizard::Wizard do

spec/extensions/extra_locales_controller_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../plugin_helper'
 
 describe ExtraLocalesControllerCustomWizard, type: :request do

spec/extensions/invites_controller_spec.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
 require_relative '../plugin_helper'
 
 describe InvitesControllerCustomWizard, type: :request do
   fab!(:topic) { Fabricate(:topic) }
-  let(:invite) do
+  let(:invite) { Invite.generate(topic.user, email: "angus@mcleod.org", topic: topic) }
-    Invite.invite_by_email("angus@email.com", topic.user, topic)
+  
-  end
   let(:template) do
     JSON.parse(File.open(
       "#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/wizard.json"

spec/extensions/users_controller_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../plugin_helper'
 
 describe CustomWizardUsersController, type: :request do

spec/extensions/wizard_field_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../plugin_helper'
 
 describe CustomWizardFieldExtension do

spec/extensions/wizard_step_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../plugin_helper'
 
 describe CustomWizardStepExtension do

spec/requests/custom_wizard/admin/custom_fields_controller_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../plugin_helper'
 
 describe CustomWizard::AdminCustomFieldsController do

spec/requests/custom_wizard/admin/logs_controller_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../plugin_helper'
 
 describe CustomWizard::AdminLogsController do

spec/requests/custom_wizard/admin/manager_controller_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../plugin_helper'
 
 describe CustomWizard::AdminManagerController do

spec/requests/custom_wizard/admin/submissions_controller_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../plugin_helper'
 
 describe CustomWizard::AdminSubmissionsController do

spec/requests/custom_wizard/admin/wizard_controller_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../plugin_helper'
 
 describe CustomWizard::AdminWizardController do

spec/requests/custom_wizard/application_controller_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../plugin_helper'
 
 describe ApplicationController do

spec/requests/custom_wizard/custom_field_extensions_spec.rb

@@ -92,4 +92,3 @@ describe "custom field extensions" do
     end
   end
 end
-  

spec/requests/custom_wizard/steps_controller_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../plugin_helper'
 
 describe CustomWizard::StepsController do

spec/requests/custom_wizard/wizard_controller_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../plugin_helper'
 
 describe CustomWizard::WizardController do

spec/serializers/custom_wizard/wizard_field_serializer_spec.rb

@@ -32,7 +32,7 @@ describe CustomWizard::FieldSerializer do
       scope: Guardian.new(user)
     ).as_json
     expect(json_array[0][:format]).to eq("YYYY-MM-DD")
-    expect(json_array[5][:file_types]).to eq(".jpg,.png")
+    expect(json_array[3][:number]).to eq(4)
-    expect(json_array[4][:number]).to eq(5)
+    expect(json_array[6][:file_types]).to eq(".jpg,.png")
   end
 end