Merge pull request #188 from joyofrails/chore/coverage

rossta · web-flow · commit cdcc7d02bb1e · 2024-08-11T10:14:10.000-04:00
Add test coverage
diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb
@@ -12,11 +12,9 @@ def connect
     private
 
     def find_verified_admin_user
-      env["warden"].user(scope: :admin_user) || reject_unauthorized_connection
+      env["warden"]&.user(scope: :admin_user) || reject_unauthorized_connection
     end
 
-    private
-
     def report_error(e)
       Rails.logger.error(e)
       Honeybadger.notify(e)
diff --git a/app/channels/heartbeat_channel.rb b/app/channels/heartbeat_channel.rb
@@ -2,7 +2,4 @@ class HeartbeatChannel < ApplicationCable::Channel
   def subscribed
     stream_for current_admin_user
   end
-
-  def unsubscribed
-  end
 end
diff --git a/app/helpers/articles_helper.rb b/app/helpers/articles_helper.rb
@@ -7,9 +7,4 @@ def render_code_block_app_file(filename, **)
       render CodeBlock::AppFile.new(filename, **)
     end
   end
-
-  def example_color_scheme_css
-    color_scheme = ColorScheme.find_by(name: "Custom Watercourse") || ColorScheme.cached_default
-    ColorSchemes::Css.new(color_scheme: color_scheme).call
-  end
 end
diff --git a/app/jobs/pwa/web_push_job.rb b/app/jobs/pwa/web_push_job.rb
@@ -14,7 +14,7 @@ def perform(title:, message:, subscription:)
       p256dh: subscription["keys"]["p256dh"],
       auth: subscription["keys"]["auth"],
       vapid: {
-        subject: "mailto:ross@rossta.net",
+        subject: Rails.application.credentials.vapid.subject,
         public_key: Rails.application.credentials.vapid.public_key,
         private_key: Rails.application.credentials.vapid.private_key
       },
diff --git a/app/views/components/pwa/web_push_demo.rb b/app/views/components/pwa/web_push_demo.rb
@@ -21,7 +21,7 @@ def view_template
       render Pwa::WebPushSubscription.new(web_push_key: web_push_key)
 
       p(class: "mt-6 mb-4") do
-        "Try sending a web push notificaiton using the form below."
+        "Try sending a web push notification using the form below."
       end
 
       form_for :web_push,
diff --git a/config/credentials/development.yml.enc.sample b/config/credentials/development.yml.enc.sample
@@ -27,5 +27,6 @@ seeds:
 
 # Run 'bin/rails console' on the command line. In the console, run 'WebPush.generate_key' and replace both keys below
 vapid:
+  subject: "mailto:hello@example.com"
   public_key: replace-me
   private_key: replace-me
diff --git a/config/credentials/production.yml.enc b/config/credentials/production.yml.enc
@@ -1 +1 @@
-IH95tU0T3O6yApnCtRMZOWAnCvyzgQqphFX5SQl649jl2TzCsXBikgURYtsk4JAGpBUKW41nimioCPGOIiGQJlUhKQseAhKJO8VKwas3LTU0aGp6c6GUdK9GD/gcf2tS+lUbu4FDVzdqXJrjcha0G+PdGxJyhOckBmmfr5GqiBaH8kwZEHVCRe2npa+APBzNry53Xyao3sOEueOkNvpvPvyET4dvPDk1I4MvRMEP3oXQ14kJbpzd9OWIrZl9DMp9WqTUBpLU8TrTgel3wY3MJMCKz9yCwlXZii+ueA08rTTU6uQeiJ1mIbMqFsQCF2x8JgKQ2I9iWJw0KP7ugEHHFfyNgcnk0U8yJKTLhuHnkMzB5xDhqq4yiqqgXWkJNlIAp8n89ZrtF8fZnkoxmEfE71DDHtoPeUjG6vfNgprzlOqicTOPMVxfpd0LLvXIRBMZdoGN+vR2iGJGJ6+Y8gJRRFvU0kcWAUG7h3ycGm/kwoAZCWrjBOR0G2WPLPzaNYHeFlEy+Z2CFLZjF2gg+u/nF7B6nZKlJ2u8EGxsxWKSyQLaK1kC644Lh7wvg849uq9NxW8wtAEClBJ4J1i3yDCcQWvtNrlQ8lW+PuUeuLJx8Z441N9uvZwoN+QTV7RAe3TOkW/gy6erK0Q+SrT3rLGgc47vemm9+cnZXF8qaxerQ86KjiUe2iw7g0V4HJusXP6sRB4grjMCdX78rdfQnQKWA24IAiPwoGYnJKs/+WrdGQaNyMfz2EgKghx3Yyz3Q6uL5BvaPygKnMXHbuw3preCocdArczX3oUg8kd6pFLCW1FAU+rzV8pCYzs3ltj0zaQs8b7ybTBhGe8paWphhVQBn9v5Ztk5t2jq09pUy4eS0nWwKeG6SSsNjjz7gt53irvTiiIv5z7Lg7eoI3+/XVeEpM5j5YWTJkzcWQGzL4a5o0Zx/QVJxo7DDjzHa6tz4nL/9WuJquBTps/RkRf1AUIC0Us0T3ZO+pCjKtWSqaHsyUO7F0zsw3zPUbnIRhG3xR8J+CJ2mrT2M+5jk2TOfRPgN8fP/f7d/ztG9mvY591xhPyanQfLvvK8u+0cz6YPO1eE+l/1+YEaYFWEUPbvxnFjKfUE34+ziw+jaIHZbp0rExGt31YUVFhj5aOZL9blhqjqdTSMK68EZFAWIM0TZHKzjsrHdq4FbpcEfJUPT0WQRRao6UtDuTiC6ILjMrN01eFcCgPIZabAPw8LTyNroX2T+l6RvzDCvHCtUa4JCuLH6IhTz6PmruzFL+ukP+aghMxVxNIWdiaWfENq3p4UW+rgUndSak5YrGh6t/wGmRGp0T1d/Lt6gW7xYFVslaSzKTzUFroxTn+4zKCczPdoIK2Sc6hFx0o7zMllThHV+JD6t+3I3i+h/bkdgh3DXRmjpOIi4C0rx3GYb9mVXlw2ojM+5P61Nx5EVkJFH+WTzRDY3T5ELfoXI7qefm6mD4wxdBYln1VBglvvbh0edBgelj3daw240KOxd0i8NdEW67yp5G1B4+8GHQ7cuwzY7zCqXMfoJHTyMnkOl3Ro3CV2rEAkITdIl7QClgBZpeTi/vDcXDJxzPdfefEy3HQaRNIqTMuqIDakCcmpUj9t4N4m5zS6Au66reNIH/Z+zyIm/Dug1DuV2qm/7qcxtpPi0r1BFEdbUg75LhMKqg+/ss/J+aO/gEbsnTA36i/CNcUVDh9Lx5996F3pRscmtbvdWkAq1iO/yCRFUF7M3ydm/TbehSwhk+YuZcNloqDQl3A2BhITGtgBxZiuZlevLAMaq0lH5oUoAmwLelvE5qCtNmXK0LZ4A1yZnk0O1x6O79un3AjZKTyFqjTOxAy1yHcWlBMv3TYn4X6HgFziEZdO--7qqeE+kDMlVpk2ev--C4uqWKdQYFELQyE539/rkg==
+5eIxs5v3En557y8TIEtZ2hxjBLdEuSM3VXFFQIy9XeQe8J7H4Ro8+4OVl5691EKhWjt8/Nnwoetulh5oCVLDBdVYTUk1s0xkljezfh0TNtD87GMse+FEkmd1+G2LeCrAtshXsu6D4bKCW6SHbHbBHjChieJ4UDctq05hWWEFuwk/DnDFHJ/Apa0uwqvH7xk980hK4bpJ846vUzcG9Fs9Y+itFmy6A9MfT1YocVyfzGYXv0UgMxQ970hzwHEEJl7m8zhQf/ni6hHP/v9O4eDGPw8EnIJCCGr+eFf0sxUe5EjUYbb2/QIpLPedhaPq19AaknnmiiVrLIEGmutQPo0H/ZrJqwurgCX+C2afn5MRJSDhllHILgoZFNoNvx01TCQA3lhuU4Ms9mKeMDk4mK3/TdTrsbnw0yzNrR1YxIAIlviRdUEIsgQgiJxezUfsf+kcucacznmh6CkGMiKpGYcrUjlO+u4k4CFMpZ+F2T2EnGnBu1QZmfrZlKcCeOD3O9rh3CQl2/35fXEM7nMWzbCoZ2mLDZgTVvgS/8r6thjuTfAtuhJy8IUdujRPDkBERLEt2ZEa7HH5dxZjpS66iX0WssPNz8+SGDGAEQW+2J6IrXF7OaK4lyzHk0i/WCBhNo5UxQXTzStwmz5ak2LcNOEA9WfZsAN0SWADT3qots3oFlk2D8KFYIO1cf8bsvUtTyPorj0D45S5Jce6e1jgrxF3VivWffnC69PCL80+fpW7KhVBdVe7zdTYP0I1GVqp12nZ8q9tfqcMAt3jY2JCTZntxJXFXIhQ/2dsAw962AvtFJlmYV04XaqIkMpjPqYk1J6rf4idZpkSLqM0GZvav1POgLBIGgwVCmF0O8IV3mS8PafUVdu1dn9xntM689fo3fo76MUm+3xb6ZqwU+vEdIkAFxZbusToJvBgHygnH0s8ttG8NuLhNarMPrM9qaiyMqgjR+k/ohMrlZ1+j5DBNVliIE82jY5l/LTw1URwZwu3e+RrLwyncqEMS/L0uZBTFJftAI09B2963p9K0VqKwmJeuw3wEWpCXaQyYj4AQsxx8a82oRv9BfBTX6iwW/pmqq60hx7MYkaRBJVelGIETPOPKzoE9N9bBEKMESwmbvxr/HZUYntPdUIOPWdrcHVclkok+6nJjplCbzCgz0NbG8y3yItqYnT8Wx2+hkMcAhEizp3rO2Fe6KhrsvmmHa1aNIPj7qje0ymq0P9dked/81sRT37RwWjCKX4j3BdBn9A3qcpQzJi1g1lmdZiSgo9f69SuIai0MrBp2nt23V3zcQbzGyddZtyxvQvtHnHed0AEwtI/awA1xeC2CIP7haewK0dCeXR2LQ6T0o4MDfnaX2m98UJIsizm4gJejVBNTo+ecWKs09JcaPuacjYoznoaCuz/BEp+BGnfXfGz/CV1Do72rrQk0TXvHPL8XN6FUNr7MCRid6AImax9pieLbbvX/EoqZrBnJhCLJsXPBOHbq8Iu2HKL7GT9/6zKjZDuoQK3mjDo99ggM+6vx8K0CAuG0+g+yCEWYW34ozirr3BGaoSt5qK5CVKpaNaT4W1O+9ynewavjn4dP0JFJGY+hib5cl+sb2MPA2w0AxJ8NsbfUjb++MavRQgpQwArPljkWBXrYhY8iVMTTWImPB5TR5LrexIWAY5LlUz44YQeuYzkEEazARrbzguJ9OtA6dJq6fvDIuIyaFC1xzg3f9xLuEHBPpouW414fSn7BB3E5dzfN7A/N38zB0CdpLF/2p91ePpmubARqvf6Cd9uBuKwjJd+3MPhEs1fe24e6fY7HxaA0D0EZJx1BVilS+mvperG/WroP6aNb93rTgnF3TYm4kn1vkXO5mVmG+g0wK92fZ2UPwZUXqHfVYxb4qRBIbwmZpDKELw+jub1vdZtW6WeAtmeZI0TOQk=--ZOnN/jjrBDzp2c+V--8o0uY03GS6lskK/BJnPRWA==
diff --git a/config/credentials/test.yml.enc b/config/credentials/test.yml.enc
@@ -1 +1 @@
-oMcWPDJEmyhhtKLVq6G16fD2N5SIQX8Yegh5oD1xq9CMvSthqfoNY5T5tw8wS1M9cc+TbnShAzgY1OX56m+T1hXDr/faQiiOaUfryppum2oYL5/t7aj655Xvm/oHuy0zreDjUbh3nZnfyir38zOhbVvOd5n0Ok/HKywVxlXVUB0kVR6BYae/TmPOfSMVNKT52deAMDomIZiQd/BQQZWHAUd938U4M4hsQGyXsV87cptC9PjlflPuHjlXvPlP5RJB3y5+sOwnKGoRyBTtuW6Rm6Dm/tuU2pAMRKm3QVMvPPvmNNX82cpQH5cddsZoqPfNVOSQSaYvx7F4Sukk15WjlKrJ95MhDQwx7SJNcKq8HNZqlGDHam2zSkYxNbgtl5lruv7q6zj6BbKT9slv/ehMb+XHM9NzF3y7ebv2y3pv3P1RvGxwEHlu5xK4FmHbdiwSIDwW/kDVkwNt3XTgHO/LGKSDVydUKOGwixrKbE87/xWfMHFk767Ytj+JIeu+Jc9cBofWnrKaxuC7Fxl9ou89D6wRx/2X3+iUlBvr8jHpWEogNd9Aie0j1UPs6wV7u7Tp7fxZHagt9xUwkNDfR/Ky4+egwPY2+Uxc/FTgsEEuF46eO6G3keuV2qN1PDOF1+LrJWOV7/mCDzCp2v9iPZk2Nvxewk0YxB0+gVJsXj2Q6WfZbuwdOIsPU3fnYAgNXMf+JtTSjZx715fYPUcxcXVB0j1YsVC3vuK75MJhh09R5ApxGx5MLy6KresQAIcKGnxd8zprGQc8WY3Sv62xEXoecEeBwgSb4Ll0zfW1GgmCyFNWEZRkY3Oni7MYXcyhoQwfz6UhSBjBPQvI6GuW/uzPfBaaG4dpdNvpr9bE54lKFIAA7G+jPokKR+IFDyFB5ukCPeudsoJvPIiVhrM0o2OOkS+tRHxxyisoDnJ/YbmrVR7K4Z9PdCGbPTj7--CtGxtOv04eUbKiLD--m+6TlCwHcphTLrg5S6Celg==
+qrXrhvnGB0xV3rVVl1B///27XhP7Aee70Yda2U9YhMrHNte2SIxrLU8YSE/sDsBAmBokaQB30EJFPoNIkCEipR3q3awcAD6iSytPA7ImhUtC8jclCUEmSdnVO3cQdTmJ6leFiYE27IhXF6rRYDLgJQrSSQEBSk3e99xj8yhZxSTS9rzSRBQGk5DG3yq/062YmkB4PMaSQtnwu2pvH0pi0O+a9ub43IXTIff6L94mdx5e0GyhOGHzPpss2Y8mebzEQV+WjGvt0E/HEzvANIUr0VZqd3B3UzF6NO/CNl6vm7UZ4RIIoigAw9Ha/L9ePBVIdZy474zsWOcWUxIIuF6GqTxq4BYi3AYqF8xmiJo6vJ1nXmLNZSG/s75ADUKlB+AQTxNSq0WNA0Yw1yB5rCGeAcV8kq3kSA7gOkHkeyIr32drj1MsMZu4zu7hH7pXeN/mRmazR31NnASEctSOki8gbWamFpuTuw9WE/SZDys9ZnpB/kWnAntmMUsI65ZJbOce0Wck3Wc/ItbGIanQ8EMRCaSnZkeTTLpHZTnP1uW+nzCMH1PQHLvAD1qxIi++hKOjuKfh3Ouve7sgdixriybEW2hO1KqDJ74d/Atz1ARL0aP9lbWWID19mqIDRfci78sjWM3Qy4WPUn6aANy4qO16R+aXlDeb3j80LRZmUFA6+CaEIJVpNSh2ZDFjKWKCTjpdBmVOndnB75uE3lDxhmeu1B21TRVeQYshpJx+K/xVTz4g1HelJmzHmCw8IDe032dq7L2J2t9iGfWb83a3JtXPoI/WhPNpl9ajCO3dXk59ZgfRl3P6XTv5q+H7brA251yP2hsyjhhIbz7rDXHTKSfSDEyxO1etvNC5sEiH4z21Q6VSI/eqeiz4Vb6//y2GbTwB6euBf2zDr/ceLPNJOMgjBSt6nCyFykw0Fivm9l9idI95Fx0G8hZwNarfZd/Cm6hh06Klq105w1YVqJ83Qfkpe2QEzK9q0eESgJR3ORQZLUY=--sPgdpWnJj4l1kmxf--TxCNl95yTxvC5mWS/+ThZg==
diff --git a/config/credentials/wasm.yml.enc b/config/credentials/wasm.yml.enc
@@ -1 +1 @@
-PjYYd+UZ6QZr+zoeP3obBwgszfbAyef6NBXaS5cq5qsfxXR0RWAyVrIidi+iN05eYpcHnbCPfmPMjbU+0CdpFx1DAvsWTiLueEKwPZ6u8kmD2bSgRQz13xIEKGOjTrUMlDNvNfM9ktuR5hXHn2hw0Fzxo5100Imlbeajqb0MbMQBbz0gcSpyNZQ/uSk5v6xgrZBjW3wPWv4MgaFDmsuZjNl44c+1wvkLZ/XvbtoIM2Q6ft0FqmtO3tYqOvUYeai3DwsfSSihFflM6mtvztCJttpYvz+W//xN1CQcrhcqz0JysdnBRDXc06AgbPLHahOJ3cdF45Ba9lgN9ciRT/fmnMGK2zLtkee4bIxLy/ttdtU5rI60oFV8hzQF/j2ySu6UtOXN+t9l+p/E1oRq8ZU3vv+dtAdkpLlK5LfhaWM/1ZA+MvMrblY2b0BuBiA/HSBNpiL8K+tbxtLeuJ2Cn5+tAefWxFAKRyo3LlJZKNkgI6fO8qaxr+WaDZhk0kqHAvA+ixszwInTeoCx2Gsp7qI/apklhXkILMSZPUP8ZGKq4XxLKt89DGKX3eWUDgPN/IEWWQkLU003ukp2d51ljjNr3eOaSAWdytALKkgNboxfsUUpQEkq7zUurUDvYN+Fev951p6hu8diBjmhYw0h0/ggyn2DXtPWZ+RsXmdB6n+MZ3TUKV/M3uWU5cy4E9ue5zAHNNCrcfWdUWoq+9z7pGjB5IRO0yPDI7dKAxsf1TX8sjyfy2koxImD6JNCH4yOgebNsCxsVL9E7J6OwS4WLIRgah2/GSBqAe0LdTtUUD816UnTYEc4pc4g7KWNvDkyRERdr7QFybjwmxo=--VXoDh07OyNY4mU6O--Ca0Uj4VrlMxO5NcH4MPNUw==
+4XZXi+b6rGuN+l4Ub7KYWu3oQvkj0JY+9Rq5HPLn8x3wYky3DXHtIDSLa9fg3Z4MYtXaCiz78p+VJ2oRjfuR8K4SvQ7LWN+GBP5yy6WWc8ar277Uop80U6Nx0p+LEv2kxu7ccmgeYlZpGb3KVGbDXoWyI99kwxXuu7F6qArAfxKyq9BDyH4742x023apoceBwxXlo3LhSQIOiFgVH3eUiC8N5vz0T8fue0FIl2g+G5u7zbfoy5L7AyW/jBc7wERbsO3Q6xU5nCz2at4iRiHQt0YYytj8AT29L2FOhbIxC2wEeX6WOuCpccc4eLB3IXuvc29iR9gOWpFn+1GcTpK5jJGfIsIumT2WoK3rtx4jMT2xzLcn2YzWQ7y5J2FBbcbSK5sWw0CIL6UooFlKJLw6C4habYbyNHWe77zG+ULdnl+LPT6xHF/dDp+A/gFk6hh7aLtvRLiWROcnZ41+9TK3afR6ZN7gU4Y5RIfXVd2lrmXqi0bmaGoifEb6Tr1mPuK/imVTUolDKma/54T/9XFOFhupSX+LEyRwiadskJDHB3KZGmtmRHjTwJuSssc0gPV7ooepZ1d3ja1ucn/RwsxnLzpIjYkorl0L97iZqFx5+hLitEpnm6Z+KG10EWgECc21vmAionySOcqblmxDVtV1+k9qZs2lbroXZ6af8wEaFsOHVv6B9D2vtO0ugn8wc4nncBeytWN+JCfyFH0GVZ9PBDPvs/yvNm3IuwNMlkS9cz8MutoFnVLg8O/a7rvKsbNoT0z2342eJKDYq6ut7JHQDQra+MKm7S8EAiyjE2MqTvMY2Acvu2dRz47ZKxVevXBEIESpLTFJit+JMKW6Hnku01kzHP7nMg7vn0pKWxUtwr6OpxvKdXqUnmju1QmgGg==--5n3wabh9//ucrff1--/XXbwVwnCw/tNOUIqxzS0Q==
diff --git a/spec/channels/connection_spec.rb b/spec/channels/connection_spec.rb
@@ -0,0 +1,13 @@
+require "rails_helper"
+
+RSpec.describe ApplicationCable::Connection, type: :channel do
+  it "successfully connects" do
+    admin = instance_double(AdminUser, id: "323")
+    connect "/cable", env: {"warden" => double(user: admin)}
+    expect(connection.current_admin_user).to eq admin
+  end
+
+  it "rejects connection" do
+    expect { connect "/cable", env: {} }.to have_rejected_connection
+  end
+end
diff --git a/spec/channels/heartbeat_channel_spec.rb b/spec/channels/heartbeat_channel_spec.rb
@@ -0,0 +1,10 @@
+require "rails_helper"
+
+RSpec.describe HeartbeatChannel, type: :channel do
+  it "successfully subscribes" do
+    stub_connection(current_admin_user: FactoryBot.create(:admin_user))
+
+    subscribe room_id: 42
+    expect(subscription).to be_confirmed
+  end
+end
diff --git a/spec/requests/pwa/installation_instructions_spec.rb b/spec/requests/pwa/installation_instructions_spec.rb
@@ -0,0 +1,11 @@
+require "rails_helper"
+
+RSpec.describe "/pwa/installation_instructions", type: :request do
+  describe "GET /pwa/installation_instructions" do
+    it "succeeds" do
+      get "/pwa/installation_instructions"
+
+      expect(response).to have_http_status(:success)
+    end
+  end
+end
diff --git a/spec/requests/pwa/web_pushes_spec.rb b/spec/requests/pwa/web_pushes_spec.rb
@@ -0,0 +1,44 @@
+require "rails_helper"
+
+RSpec.describe "/pwa/web_pushes", type: :request do
+  describe "POST" do
+    before do
+      allow(WebPush).to receive(:payload_send)
+    end
+
+    it "creates a new web push subscription" do
+      title = "Hello"
+      message = "World"
+      subscription = {
+        endpoint: "https://fcm.googleapis.com/fcm/send/KEY",
+        keys: {
+          p256dh: SecureRandom.base64(16),
+          auth: SecureRandom.base64(8)
+        }
+      }
+
+      post pwa_web_pushes_path, params: {web_push: {title:, message:, subscription: subscription.to_json}}
+      perform_enqueued_jobs
+
+      message_json = {
+        title: title,
+        body: message,
+        icon: "/icon-192.png"
+      }.to_json
+      expect(WebPush).to have_received(:payload_send).with(hash_including(
+        message: message_json,
+        endpoint: subscription[:endpoint],
+        p256dh: subscription.dig(:keys, :p256dh),
+        auth: subscription.dig(:keys, :auth),
+        vapid: {
+          subject: Rails.application.credentials.vapid.subject,
+          public_key: Rails.application.credentials.vapid.public_key,
+          private_key: Rails.application.credentials.vapid.private_key
+        },
+        ssl_timeout: kind_of(Integer),
+        open_timeout: kind_of(Integer),
+        read_timeout: kind_of(Integer)
+      ))
+    end
+  end
+end
diff --git a/spec/support/channels.rb b/spec/support/channels.rb
@@ -0,0 +1,3 @@
+RSpec.configure do |config|
+  config.include Warden::Test::Helpers, type: :channel
+end
diff --git a/spec/support/warden_helpers.rb b/spec/support/warden_helpers.rb
@@ -13,6 +13,7 @@ def login_user(user = FactoryBot.create(:user))
 end
 
 RSpec.configure do |config|
+  config.include WardenHelpers, type: :channel
   config.include WardenHelpers, type: :request
   config.include WardenHelpers, type: :system
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-IH95tU0T3O6yApnCtRMZOWAnCvyzgQqphFX5SQl649jl2TzCsXBikgURYtsk4JAGpBUKW41nimioCPGOIiGQJlUhKQseAhKJO8VKwas3LTU0aGp6c6GUdK9GD/gcf2tS+lUbu4FDVzdqXJrjcha0G+PdGxJyhOckBmmfr5GqiBaH8kwZEHVCRe2npa+APBzNry53Xyao3sOEueOkNvpvPvyET4dvPDk1I4MvRMEP3oXQ14kJbpzd9OWIrZl9DMp9WqTUBpLU8TrTgel3wY3MJMCKz9yCwlXZii+ueA08rTTU6uQeiJ1mIbMqFsQCF2x8JgKQ2I9iWJw0KP7ugEHHFfyNgcnk0U8yJKTLhuHnkMzB5xDhqq4yiqqgXWkJNlIAp8n89ZrtF8fZnkoxmEfE71DDHtoPeUjG6vfNgprzlOqicTOPMVxfpd0LLvXIRBMZdoGN+vR2iGJGJ6+Y8gJRRFvU0kcWAUG7h3ycGm/kwoAZCWrjBOR0G2WPLPzaNYHeFlEy+Z2CFLZjF2gg+u/nF7B6nZKlJ2u8EGxsxWKSyQLaK1kC644Lh7wvg849uq9NxW8wtAEClBJ4J1i3yDCcQWvtNrlQ8lW+PuUeuLJx8Z441N9uvZwoN+QTV7RAe3TOkW/gy6erK0Q+SrT3rLGgc47vemm9+cnZXF8qaxerQ86KjiUe2iw7g0V4HJusXP6sRB4grjMCdX78rdfQnQKWA24IAiPwoGYnJKs/+WrdGQaNyMfz2EgKghx3Yyz3Q6uL5BvaPygKnMXHbuw3preCocdArczX3oUg8kd6pFLCW1FAU+rzV8pCYzs3ltj0zaQs8b7ybTBhGe8paWphhVQBn9v5Ztk5t2jq09pUy4eS0nWwKeG6SSsNjjz7gt53irvTiiIv5z7Lg7eoI3+/XVeEpM5j5YWTJkzcWQGzL4a5o0Zx/QVJxo7DDjzHa6tz4nL/9WuJquBTps/RkRf1AUIC0Us0T3ZO+pCjKtWSqaHsyUO7F0zsw3zPUbnIRhG3xR8J+CJ2mrT2M+5jk2TOfRPgN8fP/f7d/ztG9mvY591xhPyanQfLvvK8u+0cz6YPO1eE+l/1+YEaYFWEUPbvxnFjKfUE34+ziw+jaIHZbp0rExGt31YUVFhj5aOZL9blhqjqdTSMK68EZFAWIM0TZHKzjsrHdq4FbpcEfJUPT0WQRRao6UtDuTiC6ILjMrN01eFcCgPIZabAPw8LTyNroX2T+l6RvzDCvHCtUa4JCuLH6IhTz6PmruzFL+ukP+aghMxVxNIWdiaWfENq3p4UW+rgUndSak5YrGh6t/wGmRGp0T1d/Lt6gW7xYFVslaSzKTzUFroxTn+4zKCczPdoIK2Sc6hFx0o7zMllThHV+JD6t+3I3i+h/bkdgh3DXRmjpOIi4C0rx3GYb9mVXlw2ojM+5P61Nx5EVkJFH+WTzRDY3T5ELfoXI7qefm6mD4wxdBYln1VBglvvbh0edBgelj3daw240KOxd0i8NdEW67yp5G1B4+8GHQ7cuwzY7zCqXMfoJHTyMnkOl3Ro3CV2rEAkITdIl7QClgBZpeTi/vDcXDJxzPdfefEy3HQaRNIqTMuqIDakCcmpUj9t4N4m5zS6Au66reNIH/Z+zyIm/Dug1DuV2qm/7qcxtpPi0r1BFEdbUg75LhMKqg+/ss/J+aO/gEbsnTA36i/CNcUVDh9Lx5996F3pRscmtbvdWkAq1iO/yCRFUF7M3ydm/TbehSwhk+YuZcNloqDQl3A2BhITGtgBxZiuZlevLAMaq0lH5oUoAmwLelvE5qCtNmXK0LZ4A1yZnk0O1x6O79un3AjZKTyFqjTOxAy1yHcWlBMv3TYn4X6HgFziEZdO--7qqeE+kDMlVpk2ev--C4uqWKdQYFELQyE539/rkg==
	`1`	+5eIxs5v3En557y8TIEtZ2hxjBLdEuSM3VXFFQIy9XeQe8J7H4Ro8+4OVl5691EKhWjt8/Nnwoetulh5oCVLDBdVYTUk1s0xkljezfh0TNtD87GMse+FEkmd1+G2LeCrAtshXsu6D4bKCW6SHbHbBHjChieJ4UDctq05hWWEFuwk/DnDFHJ/Apa0uwqvH7xk980hK4bpJ846vUzcG9Fs9Y+itFmy6A9MfT1YocVyfzGYXv0UgMxQ970hzwHEEJl7m8zhQf/ni6hHP/v9O4eDGPw8EnIJCCGr+eFf0sxUe5EjUYbb2/QIpLPedhaPq19AaknnmiiVrLIEGmutQPo0H/ZrJqwurgCX+C2afn5MRJSDhllHILgoZFNoNvx01TCQA3lhuU4Ms9mKeMDk4mK3/TdTrsbnw0yzNrR1YxIAIlviRdUEIsgQgiJxezUfsf+kcucacznmh6CkGMiKpGYcrUjlO+u4k4CFMpZ+F2T2EnGnBu1QZmfrZlKcCeOD3O9rh3CQl2/35fXEM7nMWzbCoZ2mLDZgTVvgS/8r6thjuTfAtuhJy8IUdujRPDkBERLEt2ZEa7HH5dxZjpS66iX0WssPNz8+SGDGAEQW+2J6IrXF7OaK4lyzHk0i/WCBhNo5UxQXTzStwmz5ak2LcNOEA9WfZsAN0SWADT3qots3oFlk2D8KFYIO1cf8bsvUtTyPorj0D45S5Jce6e1jgrxF3VivWffnC69PCL80+fpW7KhVBdVe7zdTYP0I1GVqp12nZ8q9tfqcMAt3jY2JCTZntxJXFXIhQ/2dsAw962AvtFJlmYV04XaqIkMpjPqYk1J6rf4idZpkSLqM0GZvav1POgLBIGgwVCmF0O8IV3mS8PafUVdu1dn9xntM689fo3fo76MUm+3xb6ZqwU+vEdIkAFxZbusToJvBgHygnH0s8ttG8NuLhNarMPrM9qaiyMqgjR+k/ohMrlZ1+j5DBNVliIE82jY5l/LTw1URwZwu3e+RrLwyncqEMS/L0uZBTFJftAI09B2963p9K0VqKwmJeuw3wEWpCXaQyYj4AQsxx8a82oRv9BfBTX6iwW/pmqq60hx7MYkaRBJVelGIETPOPKzoE9N9bBEKMESwmbvxr/HZUYntPdUIOPWdrcHVclkok+6nJjplCbzCgz0NbG8y3yItqYnT8Wx2+hkMcAhEizp3rO2Fe6KhrsvmmHa1aNIPj7qje0ymq0P9dked/81sRT37RwWjCKX4j3BdBn9A3qcpQzJi1g1lmdZiSgo9f69SuIai0MrBp2nt23V3zcQbzGyddZtyxvQvtHnHed0AEwtI/awA1xeC2CIP7haewK0dCeXR2LQ6T0o4MDfnaX2m98UJIsizm4gJejVBNTo+ecWKs09JcaPuacjYoznoaCuz/BEp+BGnfXfGz/CV1Do72rrQk0TXvHPL8XN6FUNr7MCRid6AImax9pieLbbvX/EoqZrBnJhCLJsXPBOHbq8Iu2HKL7GT9/6zKjZDuoQK3mjDo99ggM+6vx8K0CAuG0+g+yCEWYW34ozirr3BGaoSt5qK5CVKpaNaT4W1O+9ynewavjn4dP0JFJGY+hib5cl+sb2MPA2w0AxJ8NsbfUjb++MavRQgpQwArPljkWBXrYhY8iVMTTWImPB5TR5LrexIWAY5LlUz44YQeuYzkEEazARrbzguJ9OtA6dJq6fvDIuIyaFC1xzg3f9xLuEHBPpouW414fSn7BB3E5dzfN7A/N38zB0CdpLF/2p91ePpmubARqvf6Cd9uBuKwjJd+3MPhEs1fe24e6fY7HxaA0D0EZJx1BVilS+mvperG/WroP6aNb93rTgnF3TYm4kn1vkXO5mVmG+g0wK92fZ2UPwZUXqHfVYxb4qRBIbwmZpDKELw+jub1vdZtW6WeAtmeZI0TOQk=--ZOnN/jjrBDzp2c+V--8o0uY03GS6lskK/BJnPRWA==
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-oMcWPDJEmyhhtKLVq6G16fD2N5SIQX8Yegh5oD1xq9CMvSthqfoNY5T5tw8wS1M9cc+TbnShAzgY1OX56m+T1hXDr/faQiiOaUfryppum2oYL5/t7aj655Xvm/oHuy0zreDjUbh3nZnfyir38zOhbVvOd5n0Ok/HKywVxlXVUB0kVR6BYae/TmPOfSMVNKT52deAMDomIZiQd/BQQZWHAUd938U4M4hsQGyXsV87cptC9PjlflPuHjlXvPlP5RJB3y5+sOwnKGoRyBTtuW6Rm6Dm/tuU2pAMRKm3QVMvPPvmNNX82cpQH5cddsZoqPfNVOSQSaYvx7F4Sukk15WjlKrJ95MhDQwx7SJNcKq8HNZqlGDHam2zSkYxNbgtl5lruv7q6zj6BbKT9slv/ehMb+XHM9NzF3y7ebv2y3pv3P1RvGxwEHlu5xK4FmHbdiwSIDwW/kDVkwNt3XTgHO/LGKSDVydUKOGwixrKbE87/xWfMHFk767Ytj+JIeu+Jc9cBofWnrKaxuC7Fxl9ou89D6wRx/2X3+iUlBvr8jHpWEogNd9Aie0j1UPs6wV7u7Tp7fxZHagt9xUwkNDfR/Ky4+egwPY2+Uxc/FTgsEEuF46eO6G3keuV2qN1PDOF1+LrJWOV7/mCDzCp2v9iPZk2Nvxewk0YxB0+gVJsXj2Q6WfZbuwdOIsPU3fnYAgNXMf+JtTSjZx715fYPUcxcXVB0j1YsVC3vuK75MJhh09R5ApxGx5MLy6KresQAIcKGnxd8zprGQc8WY3Sv62xEXoecEeBwgSb4Ll0zfW1GgmCyFNWEZRkY3Oni7MYXcyhoQwfz6UhSBjBPQvI6GuW/uzPfBaaG4dpdNvpr9bE54lKFIAA7G+jPokKR+IFDyFB5ukCPeudsoJvPIiVhrM0o2OOkS+tRHxxyisoDnJ/YbmrVR7K4Z9PdCGbPTj7--CtGxtOv04eUbKiLD--m+6TlCwHcphTLrg5S6Celg==
	`1`	+qrXrhvnGB0xV3rVVl1B///27XhP7Aee70Yda2U9YhMrHNte2SIxrLU8YSE/sDsBAmBokaQB30EJFPoNIkCEipR3q3awcAD6iSytPA7ImhUtC8jclCUEmSdnVO3cQdTmJ6leFiYE27IhXF6rRYDLgJQrSSQEBSk3e99xj8yhZxSTS9rzSRBQGk5DG3yq/062YmkB4PMaSQtnwu2pvH0pi0O+a9ub43IXTIff6L94mdx5e0GyhOGHzPpss2Y8mebzEQV+WjGvt0E/HEzvANIUr0VZqd3B3UzF6NO/CNl6vm7UZ4RIIoigAw9Ha/L9ePBVIdZy474zsWOcWUxIIuF6GqTxq4BYi3AYqF8xmiJo6vJ1nXmLNZSG/s75ADUKlB+AQTxNSq0WNA0Yw1yB5rCGeAcV8kq3kSA7gOkHkeyIr32drj1MsMZu4zu7hH7pXeN/mRmazR31NnASEctSOki8gbWamFpuTuw9WE/SZDys9ZnpB/kWnAntmMUsI65ZJbOce0Wck3Wc/ItbGIanQ8EMRCaSnZkeTTLpHZTnP1uW+nzCMH1PQHLvAD1qxIi++hKOjuKfh3Ouve7sgdixriybEW2hO1KqDJ74d/Atz1ARL0aP9lbWWID19mqIDRfci78sjWM3Qy4WPUn6aANy4qO16R+aXlDeb3j80LRZmUFA6+CaEIJVpNSh2ZDFjKWKCTjpdBmVOndnB75uE3lDxhmeu1B21TRVeQYshpJx+K/xVTz4g1HelJmzHmCw8IDe032dq7L2J2t9iGfWb83a3JtXPoI/WhPNpl9ajCO3dXk59ZgfRl3P6XTv5q+H7brA251yP2hsyjhhIbz7rDXHTKSfSDEyxO1etvNC5sEiH4z21Q6VSI/eqeiz4Vb6//y2GbTwB6euBf2zDr/ceLPNJOMgjBSt6nCyFykw0Fivm9l9idI95Fx0G8hZwNarfZd/Cm6hh06Klq105w1YVqJ83Qfkpe2QEzK9q0eESgJR3ORQZLUY=--sPgdpWnJj4l1kmxf--TxCNl95yTxvC5mWS/+ThZg==
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-PjYYd+UZ6QZr+zoeP3obBwgszfbAyef6NBXaS5cq5qsfxXR0RWAyVrIidi+iN05eYpcHnbCPfmPMjbU+0CdpFx1DAvsWTiLueEKwPZ6u8kmD2bSgRQz13xIEKGOjTrUMlDNvNfM9ktuR5hXHn2hw0Fzxo5100Imlbeajqb0MbMQBbz0gcSpyNZQ/uSk5v6xgrZBjW3wPWv4MgaFDmsuZjNl44c+1wvkLZ/XvbtoIM2Q6ft0FqmtO3tYqOvUYeai3DwsfSSihFflM6mtvztCJttpYvz+W//xN1CQcrhcqz0JysdnBRDXc06AgbPLHahOJ3cdF45Ba9lgN9ciRT/fmnMGK2zLtkee4bIxLy/ttdtU5rI60oFV8hzQF/j2ySu6UtOXN+t9l+p/E1oRq8ZU3vv+dtAdkpLlK5LfhaWM/1ZA+MvMrblY2b0BuBiA/HSBNpiL8K+tbxtLeuJ2Cn5+tAefWxFAKRyo3LlJZKNkgI6fO8qaxr+WaDZhk0kqHAvA+ixszwInTeoCx2Gsp7qI/apklhXkILMSZPUP8ZGKq4XxLKt89DGKX3eWUDgPN/IEWWQkLU003ukp2d51ljjNr3eOaSAWdytALKkgNboxfsUUpQEkq7zUurUDvYN+Fev951p6hu8diBjmhYw0h0/ggyn2DXtPWZ+RsXmdB6n+MZ3TUKV/M3uWU5cy4E9ue5zAHNNCrcfWdUWoq+9z7pGjB5IRO0yPDI7dKAxsf1TX8sjyfy2koxImD6JNCH4yOgebNsCxsVL9E7J6OwS4WLIRgah2/GSBqAe0LdTtUUD816UnTYEc4pc4g7KWNvDkyRERdr7QFybjwmxo=--VXoDh07OyNY4mU6O--Ca0Uj4VrlMxO5NcH4MPNUw==
	`1`	+4XZXi+b6rGuN+l4Ub7KYWu3oQvkj0JY+9Rq5HPLn8x3wYky3DXHtIDSLa9fg3Z4MYtXaCiz78p+VJ2oRjfuR8K4SvQ7LWN+GBP5yy6WWc8ar277Uop80U6Nx0p+LEv2kxu7ccmgeYlZpGb3KVGbDXoWyI99kwxXuu7F6qArAfxKyq9BDyH4742x023apoceBwxXlo3LhSQIOiFgVH3eUiC8N5vz0T8fue0FIl2g+G5u7zbfoy5L7AyW/jBc7wERbsO3Q6xU5nCz2at4iRiHQt0YYytj8AT29L2FOhbIxC2wEeX6WOuCpccc4eLB3IXuvc29iR9gOWpFn+1GcTpK5jJGfIsIumT2WoK3rtx4jMT2xzLcn2YzWQ7y5J2FBbcbSK5sWw0CIL6UooFlKJLw6C4habYbyNHWe77zG+ULdnl+LPT6xHF/dDp+A/gFk6hh7aLtvRLiWROcnZ41+9TK3afR6ZN7gU4Y5RIfXVd2lrmXqi0bmaGoifEb6Tr1mPuK/imVTUolDKma/54T/9XFOFhupSX+LEyRwiadskJDHB3KZGmtmRHjTwJuSssc0gPV7ooepZ1d3ja1ucn/RwsxnLzpIjYkorl0L97iZqFx5+hLitEpnm6Z+KG10EWgECc21vmAionySOcqblmxDVtV1+k9qZs2lbroXZ6af8wEaFsOHVv6B9D2vtO0ugn8wc4nncBeytWN+JCfyFH0GVZ9PBDPvs/yvNm3IuwNMlkS9cz8MutoFnVLg8O/a7rvKsbNoT0z2342eJKDYq6ut7JHQDQra+MKm7S8EAiyjE2MqTvMY2Acvu2dRz47ZKxVevXBEIESpLTFJit+JMKW6Hnku01kzHP7nMg7vn0pKWxUtwr6OpxvKdXqUnmju1QmgGg==--5n3wabh9//ucrff1--/XXbwVwnCw/tNOUIqxzS0Q==