apply MR comments

app/assets/stylesheets/application.scss

@@ -6,11 +6,6 @@
 @import "dropzone/dist/dropzone";
 @import 'bootstrap-datepicker';
 
-// Global styles
-label {
-  text-transform: capitalize;
-}
-
 // Wordmarks
 .suite-wordmark {
   font-weight: normal;

app/controllers/acquired_media_releases_controller.rb

@@ -61,8 +61,7 @@ class AcquiredMediaReleasesController < ApplicationController
       :name,
       :territory,
       :term,
-      :person_first_name,
-      :person_last_name,
+      :person_name,
       :person_phone,
       :person_email,
       :person_company,

app/controllers/public/acquired_media_releases_controller.rb

@@ -45,9 +45,6 @@ class Public::AcquiredMediaReleasesController < Public::BaseController
     params.require(:acquired_media_release).permit(
       :name, 
       :description,
-      :person_first_name,
-      :person_last_name,
-      :person_email,
       :person_title,
       :person_phone,
       :person_fax,

app/models/acquired_media_release.rb

@@ -43,8 +43,7 @@ class AcquiredMediaRelease < ApplicationRecord
     person_address_street1 person_address_street2 person_address_city person_address_state person_address_zip person_address_country
   ]
 
-  # CATEGORIES = ["Artwork", "Film Footage", "Video Footage", "Still Photograph"].freeze
-  CATEGORIES = ["Film Footage", "Video Footage", "Still Photograph"].freeze
+  CATEGORIES = ["Artwork", "Film Footage", "Video Footage", "Still Photograph"].freeze
 
   def minor?
     false

app/models/project.rb

@@ -117,7 +117,7 @@ class Project < ApplicationRecord
     current_zoom_meeting = zoom_meetings.active.first
 
     unless current_zoom_meeting.present?
-      zoom_user = ZoomUser.for_new_meeting
+      zoom_user = ZoomUser.free.first || ZoomUser.create
       current_zoom_meeting = ZoomMeeting.create(zoom_user: zoom_user, project: self)
     end
 

app/models/zoom_user.rb

@@ -1,28 +1,19 @@
 require 'zoom_gateway'
-require 'securerandom'
 class ZoomUser < ApplicationRecord
   has_many :zoom_meetings, dependent: :nullify
 
-  enum tier: [:basic, :pro]
-
   after_create :create_api_user, if: -> { api_id.nil? }
   before_destroy :abort_destroy
 
-  scope :current_account, -> { where(account_number: ZoomGateway.ACCOUNT_NUMBER) }
   scope :free, -> { where.not(id: ZoomMeeting.active.pluck(:zoom_user_id)) }
 
+  def api_email
+    self.class.api_email(self.id)
+  end
+
   def create_api_user
-    retries ||= 0
-    self.api_id = gateway.create_host(self.class.generate_api_email)
-    self.account_number = ZoomGateway.ACCOUNT_NUMBER
+    self.api_id = gateway.create_host(api_email)
     save
-  rescue ZoomGateway::UserAlreadyExists => e
-    retries += 1
-    if retries < 3
-      retry # new api email will be generated automatically
-    else
-      raise e
-    end
   end
 
   def delete_api_user
@@ -31,22 +22,9 @@ class ZoomUser < ApplicationRecord
     save
   end
 
-  def current_account?
-    account_number == ZoomGateway.ACCOUNT_NUMBER
-  end
-
-  # Static methods
   class << self
-    def generate_api_email
-      "host#{SecureRandom.random_number(10000)}@directme"
-    end
-
-    def for_new_meeting
-      user = public_send(ZoomGateway.USER_TYPE_NAME).current_account.free.first
-      if user.nil?
-        user = public_send(ZoomGateway.USER_TYPE_NAME).current_account.create
-      end
-      user
+    def api_email(id)
+      "host#{id}@directme"
     end
   end
 

app/views/acquired_media_releases/_form.html.erb

@@ -4,7 +4,7 @@
     <div class="form-row">
       <%= form.text_field :name, required: true, wrapper_class: "col-12" %>
     </div>
-    <%= form.form_group :categories, label: { text: "Licensed property type" } do %>
+    <%= form.form_group :categories, label: { text: "Categories" } do %>
       <% AcquiredMediaRelease::CATEGORIES.each do |category| %>
         <%= form.check_box :categories, { multiple: true, label: category }, category, false %>
       <% end %>

app/views/location_releases/_form.html.erb

@@ -11,10 +11,14 @@
 
   <%= field_set_tag content_tag(:span, t(".signer_details.heading"), class: "h6 text-muted text-uppercase") do %>
     <div class="form-row">
-      <%= form.text_field :person_first_name, wrapper_class: "col-sm-6" %>
-      <%= form.text_field :person_last_name, wrapper_class: "col-sm-6" %>
+      <%= form.text_field :person_first_name, wrapper_class: "col-sm-3" %>
+      <%= form.text_field :person_last_name, wrapper_class: "col-sm-3" %>
       <%= form.phone_field :person_phone, wrapper_class: "col-sm-6" %>
+    </div>
+    <div class="form-row">
       <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
+    </div>
+    <div class="form-row">
       <%= form.text_field :person_company, wrapper_class: "col-sm-6" %>
       <%= form.text_field :person_title, wrapper_class: "col-sm-6" %>
     </div>

app/views/material_releases/_form.html.erb

@@ -13,10 +13,14 @@
 
   <%= field_set_tag content_tag(:span, t(".signer_details.heading"), class: "h6 text-muted text-uppercase") do %>
     <div class="form-row">
-      <%= form.text_field :person_first_name, wrapper_class: "col-sm-6" %>
-      <%= form.text_field :person_last_name, wrapper_class: "col-sm-6" %>
+      <%= form.text_field :person_first_name, wrapper_class: "col-sm-3" %>
+      <%= form.text_field :person_last_name, wrapper_class: "col-sm-3" %>
       <%= form.phone_field :person_phone, wrapper_class: "col-sm-6" %>
+    </div>
+    <div class="form-row">
       <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
+    </div>
+    <div class="form-row">
       <%= form.text_field :person_company, wrapper_class: "col-sm-6" %>
       <%= form.text_field :person_title, wrapper_class: "col-sm-6" %>
     </div>

app/views/public/acquired_media_releases/new.html.erb

@@ -15,12 +15,12 @@
 
       <%= card_field_set_tag t(".acquired_media_info.heading") do %>
         <div class="form-row">
-          <%= form.text_field :name, required: true, wrapper_class: "col-12" %>
+          <%= form.text_field :name, required: true, wrapper_class: "col-12", label: 'Licensor ("Owner")' %>
         </div>
         <div class="form-row">
           <%= form.text_area :description, wrapper_class: "col-12" %>
         </div>
-        <%= form.form_group :categories, label: { text: "Licensed property type" } do %>
+        <%= form.form_group :categories, label: { text: "Categories" } do %>
           <% AcquiredMediaRelease::CATEGORIES.each do |category| %>
             <%= form.check_box :categories, { multiple: true, label: category }, category, false %>
           <% end %>
@@ -31,11 +31,8 @@
 
       <%= card_field_set_tag t(".personal_info.heading") do %>
         <div class="form-row">
-          <%= form.text_field :person_first_name, wrapper_class: "col-sm-6" %>
-          <%= form.text_field :person_last_name, wrapper_class: "col-sm-6" %>
           <%= form.text_field :person_title, wrapper_class: "col-sm-6" %>
-          <%= form.phone_field :person_phone, wrapper_class: "col-sm-6", label: 'Phone' %>
-          <%= form.email_field :person_email, wrapper_class: "col-sm-6", label: 'Email' %>
+          <%= form.text_field :person_phone, wrapper_class: "col-sm-6", label: 'Phone' %>
           <%= form.text_field :person_fax, wrapper_class: "col-sm-6", label: 'Fax' %>
         </div>
         <%= render "shared/address_fields", form: form, subject: "person" %>

app/views/public/location_releases/new.html.erb

@@ -27,7 +27,11 @@
           <%= form.text_field :person_first_name, wrapper_class: "col-sm-6" %>
           <%= form.text_field :person_last_name, wrapper_class: "col-sm-6" %>
           <%= form.phone_field :person_phone, wrapper_class: "col-sm-6" %>
+        </div>
+        <div class="form-row">
           <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
+        </div>
+        <div class="form-row">
           <%= form.text_field :person_company, wrapper_class: "col-sm-6" %>
           <%= form.text_field :person_title, wrapper_class: "col-sm-6" %>
         </div>

app/views/public/material_releases/new.html.erb

@@ -27,7 +27,11 @@
           <%= form.text_field :person_first_name, wrapper_class: "col-sm-6" %>
           <%= form.text_field :person_last_name, wrapper_class: "col-sm-6" %>
           <%= form.phone_field :person_phone, wrapper_class: "col-sm-6" %>
+        </div>
+        <div class="form-row">
           <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
+        </div>
+        <div class="form-row">
           <%= form.text_field :person_company, wrapper_class: "col-sm-6" %>
           <%= form.text_field :person_title, wrapper_class: "col-sm-6" %>
         </div>

app/views/shared/_address_fields.html.erb

@@ -11,6 +11,6 @@
 </div>
 <%= form.form_group "#{field_name_prefix}address_country" do %>
   <%= form.label "#{field_name_prefix}address_country" %>
-  <%= form.country_select "#{field_name_prefix}address_country", { selected: 'US', priority: %w(US CA), prompt: true }, class: "form-control custom-select" %>
+  <%= form.country_select "#{field_name_prefix}address_country", { priority: %w(US CA), prompt: true }, class: "form-control custom-select" %>
 <% end %>
 

config/locales/en.yml

@@ -305,8 +305,6 @@ en:
         graphics_only_edl_file: If you do not upload a Graphics Only EDL, the software will not generate a Graphics Cue List.
     label:
       acquired_media_release:
-        description: Description of licensed property
-        name: Name of licensed property 
         person_address: Address
         person_address_city: City
         person_address_country: Country
@@ -316,8 +314,6 @@ en:
         person_address_zip: Zip code 
         person_company: Company
         person_email: Email address
-        person_first_name: Licensor/Owner first name
-        person_last_name: Licensor/Owner last name
         person_name: Name
         person_phone: Phone number
         person_title: Title
@@ -331,23 +327,16 @@ en:
         address_city: City
         address_country: Country
         address_state: State
-        address_street1: Address of Property
+        address_street1: Address 
         address_street2: Address (Line 2)
         address_zip: Zip code 
-        filming_ended_on: Filming end date
-        filming_started_on: Filming start date
-        name: Name of property
         person_address_city: City
         person_address_country: Country
         person_address_state: State
         person_address_street1: Address 
         person_address_street2: Address (Line 2)
         person_address_zip: Zip code 
-        person_first_name: Owner first name
-        person_last_name: Owner last name
       material_release:
-        description: Description of licensed material
-        name: Name of licensed material
         person_address: Address
         person_address_city: City
         person_address_country: Country
@@ -357,8 +346,6 @@ en:
         person_address_zip: Zip code 
         person_company: Company
         person_email: Email address
-        person_first_name: Licensor/Owner first name
-        person_last_name: Licensor/Owner last name
         person_name: Name
         person_phone: Phone number
         person_title: Title
@@ -557,7 +544,7 @@ en:
       photos:
         heading: 4 of 4 Photos
       signer_details: 
-        heading: 2 of 4 Owner Details
+        heading: 2 of 4 Signer Details
     index:
       actions:
         new: Import Release
@@ -591,7 +578,7 @@ en:
       photos:
         heading: 4 of 4 Photos
       signer_details:
-        heading: 2 of 4 Licensor/Owner Details
+        heading: 2 of 4 Signer Details
     index:
       actions:
         new: Import Release
@@ -754,7 +741,9 @@ en:
         legal:
           heading: Legal
         personal_info:
-          heading: Licensor/Owner Contact Information
+          heading: Person Details
+        personal_info:
+          heading: Signer's Contact Information
         signature:
           heading: Signature
     appearance_releases:
@@ -793,7 +782,7 @@ en:
       new:
         cancel: Cancel
         contact_info:
-          heading: Owner Contact Information
+          heading: Signer Information
         filming_info:
           heading: Filming Information
         legal:
@@ -808,7 +797,7 @@ en:
       new:
         cancel: Cancel
         contact_info:
-          heading: Licensor/Owner Contact Information
+          heading: Signer's Contact Information
         legal:
           heading: Legal
         release_info:

db/data_migrations/20200526114957_assign_account_number_and_type_to_zoom_users.rb

@@ -1,7 +0,0 @@
-class AssignAccountNumberAndTypeToZoomUsers < ActiveRecord::DataMigration
-  def up
-    ZoomUser.find_each do |zu|
-      zu.update account_number: ENV.fetch('ZOOM_ACCOUNT_NUMBER'), tier: (ENV['ZOOM_USER_TYPE'] == 'pro' ? 1 : 0)
-    end
-  end
-end

db/migrate/20200526113516_add_account_number_and_type_to_zoom_users.rb

@@ -1,6 +0,0 @@
-class AddAccountNumberAndTypeToZoomUsers < ActiveRecord::Migration[6.0]
-  def change
-    add_column :zoom_users, :account_number, :string
-    add_column :zoom_users, :tier, :integer, default: 0
-  end
-end

db/structure.sql

@@ -1592,9 +1592,7 @@ CREATE TABLE public.zoom_users (
     id bigint NOT NULL,
     api_id character varying,
     created_at timestamp(6) without time zone NOT NULL,
-    updated_at timestamp(6) without time zone NOT NULL,
-    account_number character varying,
-    tier integer DEFAULT 0
+    updated_at timestamp(6) without time zone NOT NULL
 );
 
 
@@ -3501,7 +3499,6 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20200427073429'),
 ('20200428091105'),
 ('20200507110804'),
-('20200512161738'),
-('20200526113516');
+('20200512161738');
 
 

lib/zoom_gateway.rb

@@ -3,7 +3,6 @@ class ZoomGateway
   class MeetingExpired < StandardError; end
   class UserNotFound < StandardError; end
   class TooManyHosts < StandardError; end
-  class UserAlreadyExists < StandardError; end
 
   class << self
     def USER_TYPE_NAME
@@ -24,12 +23,8 @@ class ZoomGateway
       "#{self.USER_TYPE_NAME}-directme-host"
     end
 
-    def ACCOUNT_NUMBER
-      ENV['ZOOM_ACCOUNT_NUMBER']
-    end
-
     def enable_recordings?
-      ENV['ZOOM_ENABLE_RECORDINGS'] == 'true'
+      ENV['ZOOM_ENABLE_RECORDINGS'] == '1'
     end
 
     def apply_limits?
@@ -102,8 +97,6 @@ class ZoomGateway
       raise UserNotFound, error.message
     elsif error.status_code == 3001
       raise MeetingExpired, error.message
-    elsif error.status_code == 1005
-      raise UserAlreadyExists, error.message
     else
       raise error
     end

spec/factories/zoom_users.rb

@@ -1,9 +1,5 @@
-require 'zoom_gateway'
 FactoryBot.define do
   factory :zoom_user do
-    account_number ZoomGateway.ACCOUNT_NUMBER
-    trait ZoomGateway.USER_TYPE_NAME
-
     trait :with_api_id do
       api_id "api_user_id"
     end

spec/features/user_managing_acquired_media_releases_spec.rb

@@ -5,13 +5,6 @@ feature "User managing acquired_media releases" do
   let(:project) { create(:project, members: current_user, account: current_user.primary_account) }
 
   context "when signed out" do
-    scenario "United States is default country" do
-      contract_template = create(:contract_template, project: project)
-
-      visit new_account_project_contract_template_acquired_media_release_path(project.account, project, contract_template)
-      expect(country_field_value).to eq "US"
-    end
-
     scenario "creating a release", js: true do
       contract_template = create(:contract_template, project: project)
 
@@ -26,7 +19,7 @@ feature "User managing acquired_media releases" do
 
       click_button "I have read and agree to the above"
 
-      expect(AcquiredMediaRelease.last.categories).to include("Video Footage")
+      expect(AcquiredMediaRelease.last.categories).to include("Artwork")
       expect(AcquiredMediaRelease.last.categories).to include("Still Photograph")
       expect(page).to have_content("Your release was successfully submitted. Thank you.")
     end
@@ -212,16 +205,12 @@ feature "User managing acquired_media releases" do
 
   private
 
-  def country_field_value
-    find_field("acquired_media_release[person_address_country]").value
-  end
-
   def acquired_media_name_field
     "acquired_media_release[name]"
   end
 
   def acquired_media_category_fields
-    find(:css, "#acquired_media_release_categories_video_footage").set(true)
+    find(:css, "#acquired_media_release_categories_artwork").set(true)
     find(:css, "#acquired_media_release_categories_still_photograph").set(true)
   end
 

spec/features/user_managing_location_releases_spec.rb

@@ -5,13 +5,6 @@ feature "User managing location releases" do
   let(:project) { create(:project, members: current_user, account: current_user.primary_account) }
 
   context "when signed out" do
-    scenario "United States is default country" do
-      contract_template = create(:contract_template, project: project)
-
-      visit new_account_project_contract_template_location_release_path(project.account, project, contract_template)
-      expect(country_field_value).to eq "US"
-    end
-
     scenario "creating a release", js: true do
       contract_template = create(:contract_template, project: project)
 
@@ -202,10 +195,6 @@ feature "User managing location releases" do
 
   private
 
-  def country_field_value
-    find_field("location_release[person_address_country]").value
-  end
-
   def photos_heading(photos_count = 1)
     t 'contracts.photos.heading', count: photos_count
   end

spec/features/user_managing_material_releases_spec.rb

@@ -5,13 +5,6 @@ feature "User managing material releases" do
   let(:project) { create(:project, members: current_user, account: current_user.primary_account) }
 
   context "when signed out" do
-    scenario "United States is default country" do
-      contract_template = create(:contract_template, project: project)
-
-      visit new_account_project_contract_template_material_release_path(project.account, project, contract_template)
-      expect(country_field_value).to eq "US"
-    end
-
     scenario "creating a release", js: true do
       contract_template = create(:contract_template, project: project)
 
@@ -187,10 +180,6 @@ feature "User managing material releases" do
 
   private
 
-  def country_field_value
-    find_field("material_release[person_address_country]").value
-  end
-
   def photos_heading(photos_count = 1)
     t 'contracts.photos.heading', count: photos_count
   end

spec/features/user_managing_talent_releases_spec.rb

@@ -5,13 +5,6 @@ feature "User managing talent releases" do
   let(:project) { create(:project, members: current_user, account: current_user.primary_account) }
 
   context "when signed out" do
-    scenario "United States is default country" do
-      contract_template = create(:contract_template, project: project)
-
-      visit new_account_project_contract_template_talent_release_path(project.account, project, contract_template)
-      expect(country_field_value).to eq "US"
-    end
-
     scenario "creating a release for an adult", js: true do
       contract_template = create(:contract_template, project: project)
 
@@ -281,10 +274,6 @@ feature "User managing talent releases" do
 
   private
 
-  def country_field_value
-    find_field("talent_release[person_address_country]").value
-  end
-
   def photos_heading(photos_count = 1)
     t 'contracts.photos.heading', count: photos_count
   end

spec/features/user_performs_video_analysis_spec.rb

@@ -521,8 +521,8 @@ feature "User performs video analysis" do
       new_path = polymorphic_path([:new, video, release, :video_release_confirmation])
       first("form[action='#{new_path}']").click_button
 
-      expect(page).to have_content "Timecode In"
-      expect(page).to have_content "Source File Name"
+      expect(page).to have_content "Timecode in"
+      expect(page).to have_content "Source file name"
 
       click_on "Show/Hide EDL Events"
       within "#edl_events" do
@@ -572,8 +572,8 @@ feature "User performs video analysis" do
       new_path = polymorphic_path([:new, video, release, :video_release_confirmation])
       first("form[action='#{new_path}']").click_button
 
-      expect(page).to have_content "Timecode In"
-      expect(page).to have_content "Source File Name"
+      expect(page).to have_content "Timecode in"
+      expect(page).to have_content "Source file name"
 
       click_on "Show/Hide EDL Events"
       within "#edl_events" do
@@ -748,8 +748,8 @@ feature "User performs video analysis" do
 
       open_graphics_element_modal(video)
 
-      expect(page).to have_content "Timecode In"
-      expect(page).to have_content "Source File Name"
+      expect(page).to have_content "Timecode in"
+      expect(page).to have_content "Source file name"
 
       click_on "Show/Hide EDL Events"
       within "#edl_events" do
@@ -796,8 +796,8 @@ feature "User performs video analysis" do
 
       open_graphics_element_modal(video)
 
-      expect(page).to have_content "Timecode In"
-      expect(page).to have_content "Source File Name"
+      expect(page).to have_content "Timecode in"
+      expect(page).to have_content "Source file name"
 
       click_on "Show/Hide EDL Events"
       within "#edl_events" do
@@ -1188,8 +1188,8 @@ feature "User performs video analysis" do
       open_audio_confirmation_modal
 
       expect(page).to have_field("Origin", with: "Original Music")
-      expect(page).to have_content "Timecode In"
-      expect(page).to have_content "Source File Name"
+      expect(page).to have_content "Timecode in"
+      expect(page).to have_content "Source file name"
       expect(page).to have_field("Source EDL", with: "Audio")
 
       click_on "Show/Hide EDL Events"
@@ -1219,10 +1219,10 @@ feature "User performs video analysis" do
         expect(page).to have_field("Source EDL", with: "All Tracks")
         expect(page).to have_field("Channel", with: "A1")
         expect(page).to have_field("Origin", with: "Library Music")
-        expect(page).to have_field("Timecode In", with: "01:00:00:00")
+        expect(page).to have_field("Timecode in", with: "01:00:00:00")
         expect(page).to have_field("Timecode out", with: "01:00:02:00")
         expect(page).to have_field("Duration", with: "00:00:02")
-        expect(page).to have_field("Source File Name", with: "source_file_name.wav")
+        expect(page).to have_field("Source file name", with: "source_file_name.wav")
         expect(page).to have_field("Clip name", with: "clip_name")
         expect(page).to have_field("Description", with: "description")
 
@@ -1323,8 +1323,8 @@ feature "User performs video analysis" do
 
       open_unreleased_modal(video)
 
-      expect(page).to have_content "Timecode In"
-      expect(page).to have_content "Source File Name"
+      expect(page).to have_content "Timecode in"
+      expect(page).to have_content "Source file name"
 
       click_on "Show/Hide EDL Events"
       within "#edl_events" do
@@ -1371,8 +1371,8 @@ feature "User performs video analysis" do
 
       open_unreleased_modal(video)
 
-      expect(page).to have_content "Timecode In"
-      expect(page).to have_content "Source File Name"
+      expect(page).to have_content "Timecode in"
+      expect(page).to have_content "Source file name"
 
       click_on "Show/Hide EDL Events"
       within "#edl_events" do
@@ -1445,7 +1445,7 @@ feature "User performs video analysis" do
 
     first("#suggested_matches form[action='#{new_path}']").click_button
 
-    expect(page).to have_content "Timecode In"
+    expect(page).to have_content "Timecode in"
 
     within "form[action='#{create_path}']" do
       click_button "Confirm Release"
@@ -1462,7 +1462,7 @@ feature "User performs video analysis" do
       $("#audio_matches .releasable-match button")[0].click()
     JS
 
-    expect(page).to have_content "Timecode In"
+    expect(page).to have_content "Timecode in"
   end
 
   def select_option(select_id, text)
@@ -1486,7 +1486,7 @@ feature "User performs video analysis" do
     JS
 
     expect(page).to have_field("Origin", with: "Library Music")
-    expect(page).to have_content "Timecode In"
+    expect(page).to have_content "Timecode in"
 
     within "form[action='#{create_path}']" do
       expect(page).to have_selector("#matched_file_name", text: "library_file_name")
@@ -1518,7 +1518,7 @@ feature "User performs video analysis" do
 
     first("form[action='#{new_path}']", text: text).click_button
 
-    expect(page).to have_content "Timecode In"
+    expect(page).to have_content "Timecode in"
 
     within "form[action='#{create_path}']" do
       click_button "Confirm Release"
@@ -1536,7 +1536,7 @@ feature "User performs video analysis" do
     first("#music_releases form[action='#{new_path}']", text: text).click_button
 
     expect(page).to have_field("Origin", with: "Original Music")
-    expect(page).to have_content "Timecode In"
+    expect(page).to have_content "Timecode in"
 
     within "form[action='#{create_path}']" do
       select "Vocal", from: "Music type"

spec/lib/zoom_gateway_spec.rb

@@ -66,26 +66,19 @@ RSpec.describe ZoomGateway do
     end
 
     context '.enable_recordings?' do
-      it 'is truthy when ZOOM_ENABLE_RECORDINGS is set to true' do
-        stub_env_variable('ZOOM_ENABLE_RECORDINGS', 'true')
+      it 'is truthy when ZOOM_ENABLE_RECORDINGS is set to 1' do
+        stub_env_variable('ZOOM_ENABLE_RECORDINGS', '1')
         expect(ZoomGateway.enable_recordings?).to be_truthy
       end
 
       it 'is falsey otherwise' do
-        stub_env_variable('ZOOM_ENABLE_RECORDINGS', '1')
+        stub_env_variable('ZOOM_ENABLE_RECORDINGS', '0')
         expect(ZoomGateway.enable_recordings?).to be_falsey
 
-        stub_env_variable('ZOOM_ENABLE_RECORDINGS', 'false')
+        stub_env_variable('ZOOM_ENABLE_RECORDINGS', '2')
         expect(ZoomGateway.enable_recordings?).to be_falsey
       end
     end
-
-    context '.ACCOUNT_NUMBER' do
-      it 'depends on ENV["ZOOM_ACCOUNT_NUMBER"]' do
-        stub_env_variable('ZOOM_ACCOUNT_NUMBER', 'xxx-yyy-zzz')
-        expect(ZoomGateway.ACCOUNT_NUMBER).to eq('xxx-yyy-zzz')
-      end
-    end
   end
 
   describe ".find_meeting" do
@@ -124,7 +117,9 @@ RSpec.describe ZoomGateway do
       end
 
       it 'raises an exception' do
-        stub_env_variables(ZOOM_USER_TYPE: 'pro', ZOOM_PRO_USERS_LIMIT: 2)
+        allow(ENV).to receive(:[]).and_call_original
+        allow(ENV).to receive(:[]).with('ZOOM_USER_TYPE').and_return('pro')
+        allow(ENV).to receive(:[]).with('ZOOM_PRO_USERS_LIMIT').and_return('2')
 
         expect { gateway.create_host('host-email@address') }.to raise_error(ZoomGateway::TooManyHosts)
       end
@@ -138,4 +133,11 @@ RSpec.describe ZoomGateway do
     end
   end
 
+  private
+
+  def stub_env_variable(name, value)
+    allow(ENV).to receive(:[]).and_call_original
+    allow(ENV).to receive(:[]).with(name.to_s).and_return(value.to_s)
+  end
+
 end

spec/models/app_host_spec.rb

@@ -147,4 +147,10 @@ describe AppHost do
       expect(app_domain.protocol).to eq :http
     end
   end
+
+  private
+
+  def stub_env(key, value)
+    allow(ENV).to receive(:fetch).with(key).and_return(value)
+  end
 end

spec/models/project_spec.rb

@@ -79,7 +79,7 @@ RSpec.describe Project, type: :model do
 
     context 'there is no meeting' do
       context 'there is a free user available' do
-        let!(:free_zoom_user) { create(:zoom_user, :with_api_id) }
+        let!(:free_zoom_user) { create(:zoom_user, api_id: 'user_id') }
 
         before do
           allow_any_instance_of(ZoomGateway).to receive(:create_meeting).and_return('new-meeting-id')

spec/models/zoom_user_spec.rb

@@ -1,4 +1,3 @@
-require 'zoom_gateway'
 require 'rails_helper'
 
 RSpec.describe ZoomUser, type: :model do
@@ -6,10 +5,6 @@ RSpec.describe ZoomUser, type: :model do
     it { is_expected.to have_many(:zoom_meetings).dependent(:nullify) }
   end
 
-  describe "enums" do
-    it { is_expected.to define_enum_for(:tier).with_values([:basic, :pro]) }
-  end
-
   describe 'callbacks' do
     let(:zoom_user) { build(:zoom_user) }
 
@@ -27,120 +22,10 @@ RSpec.describe ZoomUser, type: :model do
         zoom_user.save
         expect(zoom_user.api_id).to eq "retrieved_api_id"
       end
-
-      it 'assigns current account number' do
-        allow_any_instance_of(ZoomGateway).to receive(:create_host).and_return("retrieved_api_id")
-        ENV['ZOOM_ACCOUNT_NUMBER'] = 'xxx-yyy-zzz'
-
-        zoom_user.save
-        expect(zoom_user.account_number).to eq 'xxx-yyy-zzz'
-      end
     end
 
     context '#before_destroy' do
       pending 'aborts if there is api_id assigned'
     end
   end
-
-  describe 'scopes' do
-    context '.current_account' do
-      before do
-        create_list(:zoom_user, 10, :with_api_id, account_number: 'first-account-id')
-        create_list(:zoom_user, 25, :with_api_id, account_number: 'second-account-id')
-      end
-
-      it 'only returns users from currently set account' do
-        ENV['ZOOM_ACCOUNT_NUMBER'] = 'first-account-id'
-        expect(ZoomUser.current_account.count).to eq 10
-        expect(ZoomUser.current_account.pluck(:account_number).uniq.count).to eq 1
-        expect(ZoomUser.current_account.pluck(:account_number).uniq.first).to eq 'first-account-id'
-      end
-    end
-
-    context '.free' do
-      let(:free_user) { create(:zoom_user, :with_api_id) }
-      let(:busy_user) { create(:zoom_user, :with_api_id) }
-      let(:second_busy_user) { create(:zoom_user, :with_api_id) }
-      let!(:meeting_started) { create(:zoom_meeting, zoom_user: busy_user, status: :started) }
-      let!(:meeting_created) { create(:zoom_meeting, zoom_user: second_busy_user, status: :created) }
-
-      it 'returns only the users without started / created meetings' do
-        users = ZoomUser.free
-
-        expect(users).to include(free_user)
-        expect(users).not_to include(busy_user)
-        expect(users).not_to include(second_busy_user)
-      end
-    end
-  end
-
-
-  describe '.current_account?' do
-    let(:zoom_user) { create(:zoom_user, :with_api_id, account_number: 'xxx-xxx-xxx') }
-
-    it 'returns true if it belongs to currently set account' do
-      ENV['ZOOM_ACCOUNT_NUMBER'] = 'xxx-xxx-xxx'
-      expect(zoom_user.current_account?).to be_truthy
-    end
-
-    it 'returns false if it doesn\'t belong to currently set account' do
-      ENV['ZOOM_ACCOUNT_NUMBER'] = 'yyy-yyy-yyy'
-      expect(zoom_user.current_account?).to be_falsey
-    end
-  end
-
-
-  context 'static methods' do
-    describe '.generate_api_email' do
-      it 'contains @' do
-        expect(ZoomUser.generate_api_email).to include('@')
-      end
-    end
-
-    describe '.for_new_meeting' do
-      let(:a_basic) { create(:zoom_user, :with_api_id, account_number: 'aaa', tier: :basic) }
-      let(:b_basic) { create(:zoom_user, :with_api_id, account_number: 'bbb', tier: :basic) }
-      let(:a_pro) { create(:zoom_user, :with_api_id, account_number: 'aaa', tier: :pro) }
-      let(:b_pro) { create(:zoom_user, :with_api_id, account_number: 'bbb', tier: :pro) }
-
-      it 'picks free user of requested type from current account' do
-        [a_basic, a_pro, b_basic, b_pro]
-
-        stub_env_variables(ZOOM_USER_TYPE: 'basic', ZOOM_ACCOUNT_NUMBER: 'aaa')
-        expect(ZoomUser.for_new_meeting).to eq(a_basic)
-
-        stub_env_variables(ZOOM_USER_TYPE: 'pro', ZOOM_ACCOUNT_NUMBER: 'aaa')
-        expect(ZoomUser.for_new_meeting).to eq(a_pro)
-
-        stub_env_variables(ZOOM_USER_TYPE: 'basic', ZOOM_ACCOUNT_NUMBER: 'bbb')
-        expect(ZoomUser.for_new_meeting).to eq(b_basic)
-
-        stub_env_variables(ZOOM_USER_TYPE: 'pro', ZOOM_ACCOUNT_NUMBER: 'bbb')
-        expect(ZoomUser.for_new_meeting).to eq(b_pro)
-      end
-
-      context 'no free user' do
-        before do
-          allow_any_instance_of(ZoomGateway).to receive(:create_host).and_return('host-id')
-        end
-
-        it 'creates new user if there is no requested user free available under account' do
-          [a_basic, a_pro, b_basic]
-          stub_env_variables(ZOOM_USER_TYPE: 'pro', ZOOM_ACCOUNT_NUMBER: 'bbb')
-
-          expect_any_instance_of(ZoomGateway).to receive(:create_host)
-          ZoomUser.for_new_meeting
-        end
-
-        it 'creates new user if requested user is busy' do
-          [a_basic, a_pro, b_basic, b_pro]
-          stub_env_variables(ZOOM_USER_TYPE: 'pro', ZOOM_ACCOUNT_NUMBER: 'aaa')
-          create(:zoom_meeting, zoom_user: a_pro, status: :started)
-
-          expect_any_instance_of(ZoomGateway).to receive(:create_host)
-          ZoomUser.for_new_meeting
-        end
-      end
-    end
-  end
 end

spec/support/env_helper.rb

@@ -1,16 +0,0 @@
-module EnvHelper
-  def stub_env_variables(vars)
-    allow(ENV).to receive(:[]).and_call_original
-    vars.each do |variable, value|
-      allow(ENV).to receive(:[]).with(variable.to_s).and_return(value)
-    end
-  end
-
-  def stub_env_variable(key, value)
-    stub_env_variables({key => value})
-  end
-end
-
-RSpec.configure do |config|
-  config.include EnvHelper
-end