From eb7f8f1a4313222883b00787e3a76c5c1f11ab5a Mon Sep 17 00:00:00 2001 From: Senad Uka Date: Thu, 6 Aug 2020 16:57:39 +0000 Subject: [PATCH] Initial teams commit --- .env.sample | 7 +- Gemfile | 4 + Gemfile.lock | 18 ++ .../javascripts/directory_files_input.js | 9 - app/controllers/admin/accounts_controller.rb | 5 - .../admin/broadcasts_controller.rb | 24 -- app/controllers/api/user_token_controller.rb | 19 +- app/controllers/api/users_controller.rb | 33 -- .../broadcast_recordings_controller.rb | 26 -- app/controllers/broadcasts_controller.rb | 2 +- app/controllers/callbacks_controller.rb | 10 + .../material_releases_controller.rb | 53 +-- .../public/broadcasts_controller.rb | 2 +- .../public/material_releases_controller.rb | 54 +--- .../stream_notifications_controller.rb | 2 +- app/models/account.rb | 16 +- app/models/app_host.rb | 2 +- app/models/broadcast.rb | 6 +- app/models/broadcast_recording.rb | 2 - app/models/material_release.rb | 42 +-- app/policies/broadcast_recording_policy.rb | 9 - .../account_auths/_account_logo_form.html.erb | 2 +- .../_acquired_media_release.html.erb | 3 - .../acquired_media_releases/index.html.erb | 1 - app/views/admin/accounts/_broadcast.html.erb | 13 - app/views/admin/accounts/show.html.erb | 22 -- app/views/admin/broadcasts/_form.html.erb | 14 - app/views/admin/broadcasts/edit.html.erb | 6 - app/views/broadcast_recordings/destroy.js.erb | 6 - app/views/broadcasts/_broadcast.html.erb | 4 +- .../_broadcast_recording_nav.html.erb | 3 +- .../broadcasts/_broadcast_recordings.html.erb | 7 +- app/views/broadcasts/_video.html.erb | 8 +- app/views/broadcasts/show.html.erb | 9 - app/views/contract_templates/_form.html.erb | 2 +- app/views/directories/_file_form.html.erb | 2 +- app/views/layouts/admin/application.html.erb | 2 +- app/views/layouts/application.html.erb | 2 +- .../_location_release.html.erb | 4 +- app/views/location_releases/index.html.erb | 6 +- app/views/material_releases/_form.html.erb | 63 ---- .../_material_release.html.erb | 3 - app/views/material_releases/index.html.erb | 4 +- app/views/profiles/show.html.erb | 1 + app/views/public/amendments/new.html.erb | 4 - .../public/material_releases/new.html.erb | 96 ------ app/views/task_requests/splash.html.erb | 10 +- config/initializers/omniauth.rb | 20 ++ config/locales/en.yml | 66 +--- config/locales/es.yml | 62 +--- config/routes.rb | 5 +- ...dd_hidden_field_to_broadcast_recordings.rb | 5 - ...d_guardians_fields_to_material_releases.rb | 25 -- ...d_stream_and_key_override_to_broadcasts.rb | 7 - ...5912_remove_youtube_uid_from_broadcasts.rb | 5 - ...director_mode_video_embed_to_broadcasts.rb | 5 - db/structure.sql | 55 +--- lib/knock_monkeypatch.rb | 7 - spec/channels/broadcasts_channel_spec.rb | 2 +- .../admin/accounts_controller_spec.rb | 10 - .../admin/broadcasts_controller_spec.rb | 77 ----- spec/controllers/api/sync_controller_spec.rb | 2 +- .../api/user_token_controller_spec.rb | 63 ---- spec/controllers/api/users_controller_spec.rb | 78 ----- .../broadcast_recordings_controller_spec.rb | 30 -- .../controllers/broadcasts_controller_spec.rb | 29 -- spec/factories/acquired_media_releases.rb | 16 - spec/factories/broadcast_recordings.rb | 3 +- spec/factories/broadcasts.rb | 11 - spec/factories/material_releases.rb | 20 -- .../user_manages_contract_templates_spec.rb | 2 +- .../user_manages_project_directories_spec.rb | 7 - ...r_managing_acquired_media_releases_spec.rb | 120 +++---- .../features/user_managing_broadcasts_spec.rb | 50 +-- .../user_managing_location_releases_spec.rb | 28 +- .../user_managing_material_releases_spec.rb | 303 +----------------- spec/models/account_spec.rb | 12 - spec/models/broadcast_spec.rb | 30 -- 78 files changed, 174 insertions(+), 1623 deletions(-) delete mode 100644 app/assets/javascripts/directory_files_input.js delete mode 100644 app/controllers/admin/broadcasts_controller.rb delete mode 100644 app/controllers/api/users_controller.rb delete mode 100644 app/controllers/broadcast_recordings_controller.rb create mode 100644 app/controllers/callbacks_controller.rb delete mode 100644 app/policies/broadcast_recording_policy.rb delete mode 100644 app/views/admin/accounts/_broadcast.html.erb delete mode 100644 app/views/admin/broadcasts/_form.html.erb delete mode 100644 app/views/admin/broadcasts/edit.html.erb delete mode 100644 app/views/broadcast_recordings/destroy.js.erb create mode 100644 config/initializers/omniauth.rb delete mode 100644 db/migrate/20200724084722_add_hidden_field_to_broadcast_recordings.rb delete mode 100644 db/migrate/20200727143209_add_guardians_fields_to_material_releases.rb delete mode 100644 db/migrate/20200730050903_add_stream_and_key_override_to_broadcasts.rb delete mode 100644 db/migrate/20200803145912_remove_youtube_uid_from_broadcasts.rb delete mode 100644 db/migrate/20200803150138_add_director_mode_video_embed_to_broadcasts.rb delete mode 100644 lib/knock_monkeypatch.rb delete mode 100644 spec/controllers/admin/broadcasts_controller_spec.rb delete mode 100644 spec/controllers/api/user_token_controller_spec.rb delete mode 100644 spec/controllers/api/users_controller_spec.rb delete mode 100644 spec/controllers/broadcast_recordings_controller_spec.rb diff --git a/.env.sample b/.env.sample index 578cac9..c506d1a 100644 --- a/.env.sample +++ b/.env.sample @@ -7,6 +7,8 @@ AWS_SECRET_ACCESS_KEY= AWS_REGION= BRAYNIAC_AI_API_ENDPOINT=https://z99cprg2eg.execute-api.us-east-1.amazonaws.com/dev/v0.0.1 +SOURCE_AUDIO_API_ENDPOINT=https://bigmedia.sourceaudio.com/api +SOURCE_AUDIO_TOKEN= # Optional REDIS_URL= @@ -14,6 +16,7 @@ REDIS_URL= # Required for Zoom.us integration ZOOM_API_KEY= ZOOM_API_SECRET= +ZOOM_ACCOUNT_NUMBER= ZOOM_PRO_USERS_LIMIT= # defaults to 3 ZOOM_USER_TYPE= # 'pro' / 'basic' ZOOM_ENABLE_RECORDINGS= # true / false (default: false) @@ -25,7 +28,3 @@ MUX_TOKEN_ID= MUX_TOKEN_SECRET= MUX_BROADCAST_SERVER_URL=rtmp://global-live.mux.com:5222/app MUX_TEST_MODE_DISABLED= - -# Required for creating user through API -CUSTOM_API_TOKEN= - diff --git a/Gemfile b/Gemfile index 5edcd45..098be61 100644 --- a/Gemfile +++ b/Gemfile @@ -139,6 +139,10 @@ gem 'rack-cors' # Ruby wrappers for the HubSpot REST API gem "hubspot-ruby" +# authenticate via Microsoft +# gem 'omniauth-microsoft_graph', git: 'https://github.com/m4c3/omniauth-microsoft_graph' +gem 'omniauth-microsoft_graph' + group :development, :test, :review do # Call "byebug" anywhere in the code to stop execution and get a debugger console gem "byebug", "~> 11.0.1", platforms: [:mri, :mingw, :x64_mingw] diff --git a/Gemfile.lock b/Gemfile.lock index 6998497..15ae75b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -220,6 +220,7 @@ GEM activesupport (>= 4.2.0) hashdiff (1.0.1) hashery (2.1.2) + hashie (4.1.0) hexapdf (0.9.3) cmdparse (~> 3.0, >= 3.0.3) geom2d (~> 0.2) @@ -297,6 +298,7 @@ GEM money (~> 6.13.2) railties (>= 3.0) msgpack (1.3.1) + multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) nio4r (2.5.2) @@ -308,6 +310,21 @@ GEM warden oath-generators (1.0.1) oath (>= 0.0.12) + oauth2 (1.4.4) + faraday (>= 0.8, < 2.0) + jwt (>= 1.0, < 3.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 3) + omniauth (1.9.1) + hashie (>= 3.4.6) + rack (>= 1.6.2, < 3) + omniauth-microsoft_graph (0.3.3) + omniauth (~> 1.1, >= 1.1.1) + omniauth-oauth2 (~> 1.6) + omniauth-oauth2 (1.6.0) + oauth2 (~> 1.1) + omniauth (~> 1.9) parallel (1.19.1) parity (3.2.0) parser (2.6.5.0) @@ -552,6 +569,7 @@ DEPENDENCIES mux_ruby! oath (~> 1.1.0) oath-generators (~> 1.0.1) + omniauth-microsoft_graph parity (~> 3.2.0) pdf-reader (~> 2.1.0) pdfkit (~> 0.8.2) diff --git a/app/assets/javascripts/directory_files_input.js b/app/assets/javascripts/directory_files_input.js deleted file mode 100644 index 728efc3..0000000 --- a/app/assets/javascripts/directory_files_input.js +++ /dev/null @@ -1,9 +0,0 @@ -$(document).on("turbolinks:load", function() { - $("#upload_directory_files").on('click', function(e){ - const newFilesCount = $('input[name = "directory[files][]"][type = "hidden"]').length; - - if (newFilesCount === 0){ - e.preventDefault(); - } - }); -}); \ No newline at end of file diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb index b69b710..aec98e3 100644 --- a/app/controllers/admin/accounts_controller.rb +++ b/app/controllers/admin/accounts_controller.rb @@ -20,7 +20,6 @@ class Admin::AccountsController < Admin::ApplicationController def show @videos = filtered_account_videos.order(created_at: :desc, project_id: :desc).paginate(page: params[:page]) - @broadcasts = account_broadcasts.order(created_at: :desc, project_id: :desc).paginate(page: params[:page]) end def edit @@ -71,8 +70,4 @@ class Admin::AccountsController < Admin::ApplicationController @account.videos end end - - def account_broadcasts - @account.broadcasts - end end diff --git a/app/controllers/admin/broadcasts_controller.rb b/app/controllers/admin/broadcasts_controller.rb deleted file mode 100644 index 8e37c18..0000000 --- a/app/controllers/admin/broadcasts_controller.rb +++ /dev/null @@ -1,24 +0,0 @@ -class Admin::BroadcastsController < Admin::ApplicationController - before_action :set_broadcast, only: [:edit, :update] - - def edit - end - - def update - if @broadcast.update(broadcast_update_params) - redirect_to [:admin, @broadcast.project.account], notice: t(".notice") - else - render :edit - end - end - - private - - def set_broadcast - @broadcast = authorize policy_scope(Broadcast).find(params[:id]) - end - - def broadcast_update_params - params.require(:broadcast).permit(:stream_url_override, :stream_key_override, :director_mode_video_embed) - end -end diff --git a/app/controllers/api/user_token_controller.rb b/app/controllers/api/user_token_controller.rb index cae81f9..c9ab895 100644 --- a/app/controllers/api/user_token_controller.rb +++ b/app/controllers/api/user_token_controller.rb @@ -1,12 +1,5 @@ -# frozen_string_literal: true - -require './lib/knock_monkeypatch' - class Api::UserTokenController < Knock::AuthTokenController - include Oath::ControllerHelpers - skip_before_action :verify_authenticity_token - before_action :sign_in_user rescue_from Exception, :with => :return_error @@ -17,7 +10,7 @@ class Api::UserTokenController < Knock::AuthTokenController logger.error "==Handled=======" logger.error exception.message logger.error exception.backtrace.join("\n") - logger.error "==Handled=======" + logger.error "==Handled=======" case exception when ActiveRecord::RecordNotFound @status = 404 @@ -34,18 +27,12 @@ class Api::UserTokenController < Knock::AuthTokenController end # for some reason render json_errors is not working - # simulating JSON API support - render json: { + # simulating JSON API support + render json: { errors: [{ status: @status.to_s, title: @message }] } end - - private - - def sign_in_user - sign_in(entity) - end end diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb deleted file mode 100644 index 1af1d76..0000000 --- a/app/controllers/api/users_controller.rb +++ /dev/null @@ -1,33 +0,0 @@ -# frozen_string_literal: true - -class Api::UsersController < Api::ApiController - skip_before_action :authenticate_user - before_action :verify_custom_token, only: :create - - def create - if user_params[:email].nil? || user_params[:password].nil? - raise ActionController::ParameterMissing.new 'Missing email or password' - end - - user = Oath::Services::SignUp.new(user_params).perform - render json: user.slice(:email, :created_at, :first_name, :last_name) - end - - private - - def user_params - params.require(:user).permit(%i[ - email - password - first_name - last_name - ]) - end - - def verify_custom_token - if token.blank? || token != ENV['CUSTOM_API_TOKEN'] - unauthorized_entity(:user) - end - end - -end diff --git a/app/controllers/broadcast_recordings_controller.rb b/app/controllers/broadcast_recordings_controller.rb deleted file mode 100644 index 477edda..0000000 --- a/app/controllers/broadcast_recordings_controller.rb +++ /dev/null @@ -1,26 +0,0 @@ -class BroadcastRecordingsController < ApplicationController - layout "project" - - before_action :set_project - before_action :set_broadcast - before_action :set_recording - - def destroy - @recording.update(hidden: true) - @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page]) - end - - private - - def set_project - @project = policy_scope(Project).find(params[:project_id]) - end - - def set_broadcast - @broadcast = authorize policy_scope(@project.broadcasts).find(params[:broadcast_id]) - end - - def set_recording - @recording = authorize policy_scope(@broadcast.broadcast_recordings).find(params[:id]) - end -end diff --git a/app/controllers/broadcasts_controller.rb b/app/controllers/broadcasts_controller.rb index 22d59bc..072498b 100644 --- a/app/controllers/broadcasts_controller.rb +++ b/app/controllers/broadcasts_controller.rb @@ -27,7 +27,7 @@ class BroadcastsController < ApplicationController def show @conference_url = url_for [@broadcast.project, @broadcast, :zoom_meeting] - @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page]) + @recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page]) @files = @broadcast.files.order("created_at DESC").paginate(page: params[:files_page]) render layout: 'application' end diff --git a/app/controllers/callbacks_controller.rb b/app/controllers/callbacks_controller.rb new file mode 100644 index 0000000..2f727ae --- /dev/null +++ b/app/controllers/callbacks_controller.rb @@ -0,0 +1,10 @@ +class CallbacksController < ApplicationController + skip_before_action :require_login + skip_after_action :verify_authorized, except: :index + skip_after_action :verify_policy_scoped, only: :index + skip_before_action :verify_authenticity_token + + def create + render plain: params.inspect + end +end diff --git a/app/controllers/material_releases_controller.rb b/app/controllers/material_releases_controller.rb index 3a83b4a..e4d6ff1 100644 --- a/app/controllers/material_releases_controller.rb +++ b/app/controllers/material_releases_controller.rb @@ -50,58 +50,11 @@ class MaterialReleasesController < ApplicationController private - def person_params - %i[ - person_first_name - person_last_name - person_phone - person_company - person_email - person_title - person_address_street1 - person_address_street2 - person_address_city - person_address_state - person_address_zip - person_address_country - ] - end - - def guardian_params - %i[ - guardian_first_name - guardian_last_name - guardian_phone - guardian_email - guardian_photo - guardian_address_street1 - guardian_address_street2 - guardian_address_city - guardian_address_state - guardian_address_zip - guardian_address_country - ] - end - - def second_guardian_params - %i[ - guardian_2_first_name - guardian_2_last_name - guardian_2_phone - guardian_2_email - guardian_2_photo - guardian_2_address_street1 - guardian_2_address_street2 - guardian_2_address_city - guardian_2_address_state - guardian_2_address_zip - guardian_2_address_country - ] - end - def material_release_params - params.require(:material_release).permit(person_params, guardian_params, second_guardian_params, :minor, + params.require(:material_release).permit( :name, :address_street1, :address_street2, :address_city, :address_state, :address_zip, :address_country, + :person_first_name, :person_last_name, :person_title, :person_company, :person_phone, :person_email, + :person_address_street1, :person_address_street2, :person_address_city, :person_address_state, :person_address_zip, :person_address_country, :applicable_medium_id, :applicable_medium_text, :territory_id, :territory_text, :term_id, :term_text, diff --git a/app/controllers/public/broadcasts_controller.rb b/app/controllers/public/broadcasts_controller.rb index aca8f57..bad8a1c 100644 --- a/app/controllers/public/broadcasts_controller.rb +++ b/app/controllers/public/broadcasts_controller.rb @@ -5,7 +5,7 @@ class Public::BroadcastsController < Public::BaseController def show @conference_url = broadcast_zoom_meeting_url(@broadcast.token) @multi_view_broadcasts = multi_view_broadcasts - @recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page]) + @recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page]) @files = @broadcast.files.order("created_at DESC").paginate(page: params[:files_page]) render 'broadcasts/show' diff --git a/app/controllers/public/material_releases_controller.rb b/app/controllers/public/material_releases_controller.rb index 2cfcf14..5aef717 100644 --- a/app/controllers/public/material_releases_controller.rb +++ b/app/controllers/public/material_releases_controller.rb @@ -39,59 +39,11 @@ class Public::MaterialReleasesController < Public::BaseController authorize material_releases.build(params) end - def person_params - %i[ - person_first_name - person_last_name - person_phone - person_email - person_title - person_company - person_address_street1 - person_address_street2 - person_address_city - person_address_state - person_address_zip - person_address_country - ] - end - - def guardian_params - %i[ - guardian_first_name - guardian_last_name - guardian_phone - guardian_email - guardian_photo - guardian_address_street1 - guardian_address_street2 - guardian_address_city - guardian_address_state - guardian_address_zip - guardian_address_country - ] - end - - def second_guardian_params - %i[ - guardian_2_first_name - guardian_2_last_name - guardian_2_phone - guardian_2_email - guardian_2_photo - guardian_2_address_street1 - guardian_2_address_street2 - guardian_2_address_city - guardian_2_address_state - guardian_2_address_zip - guardian_2_address_country - ] - end - - def material_release_params - params.require(:material_release).permit(person_params, guardian_params, second_guardian_params, :minor, + params.require(:material_release).permit( :name, :address_street1, :address_street2, :address_city, :address_state, :address_zip, :address_country, + :person_first_name, :person_last_name, :person_title, :person_company, :person_phone, :person_email, + :person_address_street1, :person_address_street2, :person_address_city, :person_address_state, :person_address_zip, :person_address_country, :signature_base64, :locale, :contract_template, :description, photos: [] ) diff --git a/app/controllers/stream_notifications_controller.rb b/app/controllers/stream_notifications_controller.rb index ad4a7cb..76a77c8 100644 --- a/app/controllers/stream_notifications_controller.rb +++ b/app/controllers/stream_notifications_controller.rb @@ -35,7 +35,7 @@ class StreamNotificationsController < ApplicationController duration = notification.dig(:data, :duration) recording = @broadcast.broadcast_recordings.create!(asset_uid: asset_uid, asset_playback_uid: playback_uid, file_name: file_name, duration: duration) - recordings = @broadcast.broadcast_recordings.visible.order_by_recent.paginate(page: params[:page]) + recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page]) link = helpers.link_to(recording.broadcast_name.titleize, recording.download_url, target: "_blank") message = "Your recent live stream has been recorded and is available for download here: #{link}" diff --git a/app/models/account.rb b/app/models/account.rb index b2f0a60..de3a812 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -5,7 +5,6 @@ class Account < ApplicationRecord has_many :users, through: :account_auths has_many :projects, dependent: :destroy has_many :videos, through: :projects - has_many :broadcasts, through: :projects has_many :contract_templates, through: :projects validates :name, presence: true @@ -64,19 +63,6 @@ class Account < ApplicationRecord ])).sum(:byte_size).to_f end - def total_number_of_releases - [ - MiscRelease.where(project: projects).size, - AppearanceRelease.where(project: projects).size, - TalentRelease.where(project: projects).size, - MaterialRelease.where(project: projects).size, - MedicalRelease.where(project: projects).size, - LocationRelease.where(project: projects).size, - AcquiredMediaRelease.where(project: projects).size, - MusicRelease.where(project: projects).size - ].sum - end - def to_param slug end @@ -98,7 +84,7 @@ class Account < ApplicationRecord end def taskme_enabled? - plan_uid.to_s == "me_suite" || plan_uid.to_s == "taskme" + ENV["TASKME_ENABLED"] && (plan_uid.to_s == "me_suite" || plan_uid.to_s == "taskme") end def plan_name diff --git a/app/models/app_host.rb b/app/models/app_host.rb index 3ea8747..ea893ee 100644 --- a/app/models/app_host.rb +++ b/app/models/app_host.rb @@ -15,7 +15,7 @@ class AppHost end def domain_with_port - [domain, port].compact.join(":") + [domain, port].reject(&:blank?).compact.join(":") end def protocol diff --git a/app/models/broadcast.rb b/app/models/broadcast.rb index 349ea65..d1f6943 100644 --- a/app/models/broadcast.rb +++ b/app/models/broadcast.rb @@ -35,11 +35,7 @@ class Broadcast < ApplicationRecord end def stream_server_url - stream_url_override.presence || ENV["MUX_BROADCAST_SERVER_URL"] - end - - def stream_server_key - stream_key_override.presence || stream_key + ENV['MUX_BROADCAST_SERVER_URL'] end def zoom_meeting_url diff --git a/app/models/broadcast_recording.rb b/app/models/broadcast_recording.rb index a7add7d..6ad23bd 100644 --- a/app/models/broadcast_recording.rb +++ b/app/models/broadcast_recording.rb @@ -5,8 +5,6 @@ class BroadcastRecording < ApplicationRecord validates :asset_uid, uniqueness: true - scope :visible, -> { where(hidden: false) } - def download_url "https://stream.mux.com/#{asset_playback_uid}/#{file_name}?download=#{download_file_name}" end diff --git a/app/models/material_release.rb b/app/models/material_release.rb index 258a33a..874981b 100644 --- a/app/models/material_release.rb +++ b/app/models/material_release.rb @@ -12,11 +12,6 @@ class MaterialRelease < ApplicationRecord include PersonName include CsvExportable include Approvable - include GuardianPhotoable - include SecondGuardianPhotoable - include GuardianName - include SecondGuardianName - class << self def custom_csv_exportable_headers @@ -35,39 +30,6 @@ class MaterialRelease < ApplicationRecord %w(person_address_country country) ] - composed_of :guardian_address, - class_name: 'Address', - mapping: [ - %w[guardian_address_street1 street1], - %w[guardian_address_street2 street2], - %w[guardian_address_city city], - %w[guardian_address_state state], - %w[guardian_address_zip zip], - %w[guardian_address_country country] - ] - - composed_of :guardian_2_address, - class_name: 'Address', - mapping: [ - %w[guardian_2_address_street1 street1], - %w[guardian_2_address_street2 street2], - %w[guardian_2_address_city city], - %w[guardian_2_address_state state], - %w[guardian_2_address_zip zip], - %w[guardian_2_address_country country] - ] - - # We don't care for the argument but method WILL receive option name - # when called from inside with_option block, hence * argument - def self.face_photo_acceptable_content_types(*) - ['image/png', 'image/jpeg'] - end - - def self.acceptable_import_file_extensions - ['.png', '.jpeg', '.jpg', '.pdf'] - end - - validates :name, presence: true validates :person_email, email: true, allow_blank: true @@ -85,8 +47,8 @@ class MaterialRelease < ApplicationRecord @contact_person ||= Contact.new(person_name, person_address, person_email, person_phone) end - def second_guardian_present? - guardian_2_first_name.present? + def minor? + false end def uses_edl? diff --git a/app/policies/broadcast_recording_policy.rb b/app/policies/broadcast_recording_policy.rb deleted file mode 100644 index 7423f2d..0000000 --- a/app/policies/broadcast_recording_policy.rb +++ /dev/null @@ -1,9 +0,0 @@ -class BroadcastRecordingPolicy < ApplicationPolicy - def destroy? - if user.nil? || user.user.nil? - return false - end - - user.manager? || user.account_manager? - end -end diff --git a/app/views/account_auths/_account_logo_form.html.erb b/app/views/account_auths/_account_logo_form.html.erb index 33af982..c593522 100644 --- a/app/views/account_auths/_account_logo_form.html.erb +++ b/app/views/account_auths/_account_logo_form.html.erb @@ -1,4 +1,4 @@ <%= bootstrap_form_with model: account, url: account_path, html: { autocorrect: :off, autocapitalize: :none, autocomplete: :off, spellcheck: false }, layout: :inline, remote: true do |form| %> - <%= form.file_field :logo, hide_label: true, accept: "image/*", placeholder: "Upload Logo", direct_upload: true, wrapper_class: "mr-1", required: true %> + <%= form.file_field :logo, hide_label: true, accept: "image/*", placeholder: "Upload Logo", direct_upload: true, wrapper_class: "mr-1" %> <%= form.button(fa_icon("upload", text: t(".submit")), class: "btn btn-md btn-primary", data: { disable_with: t("shared.disable_with") }) %> <% end %> diff --git a/app/views/acquired_media_releases/_acquired_media_release.html.erb b/app/views/acquired_media_releases/_acquired_media_release.html.erb index ab0f400..2ebcc67 100644 --- a/app/views/acquired_media_releases/_acquired_media_release.html.erb +++ b/app/views/acquired_media_releases/_acquired_media_release.html.erb @@ -18,9 +18,6 @@ <%= fa_icon("warning", text: t(".no_media"), class: "text-danger") %> <% end %> - - <%= contact_info_for(acquired_media_release.contact_person) %> - <%= notes_preview acquired_media_release.notes.order_by_recent %> diff --git a/app/views/acquired_media_releases/index.html.erb b/app/views/acquired_media_releases/index.html.erb index 38c41dd..3bbc09c 100644 --- a/app/views/acquired_media_releases/index.html.erb +++ b/app/views/acquired_media_releases/index.html.erb @@ -29,7 +29,6 @@ <%= t '.table_headers.approved'%> <%= AcquiredMediaRelease.human_attribute_name(:name) %> <%= t(".table_headers.file_infos_count") %> - <%= t(".table_headers.owner_info") %> <%= t(".table_headers.notes") %> <%= t(".table_headers.tags") %> <%= t(".table_headers.signed_at") %> diff --git a/app/views/admin/accounts/_broadcast.html.erb b/app/views/admin/accounts/_broadcast.html.erb deleted file mode 100644 index 3d4cc59..0000000 --- a/app/views/admin/accounts/_broadcast.html.erb +++ /dev/null @@ -1,13 +0,0 @@ - - <%= broadcast.project.name %> - <%= broadcast.name %> - -
- <%= button_tag "Manage", class: "btn btn-light btn-sm dropdown-toggle border", data: { toggle: "dropdown", boundary: "window" }, aria: { haspopup: true, expanded: false } %> -
- <%= link_to "View on Mux", "#{ENV['MUX_LIVE_STREAM_DASHBOARD_URL']}/#{broadcast.stream_uid}", class: "dropdown-item", target: "_blank" %> - <%= link_to "Edit", [:edit, :admin, broadcast, locale: I18n.locale], class: "dropdown-item" %> -
-
- - diff --git a/app/views/admin/accounts/show.html.erb b/app/views/admin/accounts/show.html.erb index f900f9d..dfc6ca1 100644 --- a/app/views/admin/accounts/show.html.erb +++ b/app/views/admin/accounts/show.html.erb @@ -9,8 +9,6 @@
<%= @account.users.size %>
Created at
<%= time_ago_in_words(@account.created_at) %> ago
-
# of Releases
-
<%= @account.total_number_of_releases %>
<% end %> @@ -36,25 +34,5 @@ <%= will_paginate @videos %> <% end %> -
- <%= card_field_set_tag "Broadcasts" do %> -
- - - - - - - - - - <%= render partial: "admin/accounts/broadcast", collection: @broadcasts %> - -
ProjectName
-
-
- <%= will_paginate @broadcasts %> -
- <% end %> diff --git a/app/views/admin/broadcasts/_form.html.erb b/app/views/admin/broadcasts/_form.html.erb deleted file mode 100644 index acd53ac..0000000 --- a/app/views/admin/broadcasts/_form.html.erb +++ /dev/null @@ -1,14 +0,0 @@ -<%= errors_summary_for broadcast %> - -<%= bootstrap_form_with model: model, local: true do |form| %> - <%= form.text_field :stream_url_override %> - <%= form.text_field :stream_key_override %> - <%= form.text_area :director_mode_video_embed %> - -
- <%= link_to t("shared.cancel"), [:admin, broadcast.project.account], class: "col-3 text-reset" %> -
- <%= form.submit class: class_string("btn btn-block", ["btn-success", "btn-primary"] => broadcast.new_record?), data: { disable_with: t("shared.disable_with") } %> -
-
-<% end %> diff --git a/app/views/admin/broadcasts/edit.html.erb b/app/views/admin/broadcasts/edit.html.erb deleted file mode 100644 index 1dc8bb5..0000000 --- a/app/views/admin/broadcasts/edit.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -
- <%= card_header text: t(".heading"), close_action_path: [:admin, @broadcast.project.account] %> -
- <%= render "form", model: [:admin, @broadcast], broadcast: @broadcast %> -
-
diff --git a/app/views/broadcast_recordings/destroy.js.erb b/app/views/broadcast_recordings/destroy.js.erb deleted file mode 100644 index 0359114..0000000 --- a/app/views/broadcast_recordings/destroy.js.erb +++ /dev/null @@ -1,6 +0,0 @@ -var dom_id = "<%= dom_id(@recording) %>" -$('[data-id="' + dom_id + '"]').remove(); -<% if @recordings.empty? %> - $("#broadcast_recordings_nav").append('

Recordings will appear here

') -<% end %> -$("#broadcast_recordings").html("<%= j render(partial: 'broadcasts/broadcast_recordings', locals: { recordings: @recordings, broadcast: @broadcast }) %>"); \ No newline at end of file diff --git a/app/views/broadcasts/_broadcast.html.erb b/app/views/broadcasts/_broadcast.html.erb index c40b09c..8cfb573 100644 --- a/app/views/broadcasts/_broadcast.html.erb +++ b/app/views/broadcasts/_broadcast.html.erb @@ -16,8 +16,8 @@
<%= button_tag t(".actions.manage"), class: "btn btn-light btn-sm dropdown-toggle border", data: { toggle: "dropdown", boundary: "window" }, aria: { haspopup: true, expanded: false } %>
- <%= link_to fa_icon("link fw", text: "Copy Stream URL"), broadcast.stream_server_url, class: "dropdown-item", data: { behavior: "clipboard" } %> - <%= link_to fa_icon("key fw", text: "Copy Stream Key"), broadcast.stream_server_key, class: "dropdown-item", data: { behavior: "clipboard" } %> + <%= link_to fa_icon("link fw", text: "Copy Stream URL"), ENV['MUX_BROADCAST_SERVER_URL'], class: "dropdown-item", data: { behavior: "clipboard" } %> + <%= link_to fa_icon("key fw", text: "Copy Stream Key"), broadcast.stream_key, class: "dropdown-item", data: { behavior: "clipboard" } %> <% if policy(broadcast).show? %> <%= link_to fa_icon("file-video-o fw", text: "View"), [broadcast.project, broadcast], class: "dropdown-item", target: '_blank' %> <% end %> diff --git a/app/views/broadcasts/_broadcast_recording_nav.html.erb b/app/views/broadcasts/_broadcast_recording_nav.html.erb index bf80413..5ef7ca0 100644 --- a/app/views/broadcasts/_broadcast_recording_nav.html.erb +++ b/app/views/broadcasts/_broadcast_recording_nav.html.erb @@ -1,3 +1,2 @@ -<%= link_to broadcast_recording.download_file_name, "javascript:void(0);", class: "dropdown-item", data: { behavior: "play_recording", playback_url: broadcast_recording.playback_url, id: dom_id(broadcast_recording) } %> - +<%= link_to broadcast_recording.download_file_name, "javascript:void(0);", class: "dropdown-item", data: { behavior: "play_recording", playback_url: broadcast_recording.playback_url } %> diff --git a/app/views/broadcasts/_broadcast_recordings.html.erb b/app/views/broadcasts/_broadcast_recordings.html.erb index 73f6f91..2dd23fb 100644 --- a/app/views/broadcasts/_broadcast_recordings.html.erb +++ b/app/views/broadcasts/_broadcast_recordings.html.erb @@ -2,12 +2,7 @@

Click below to download the recordings of the live stream.

    <% recordings.each do |recording| %> -
  • - <%= link_to(recording.download_file_name, recording.download_url, target: "_blank") %> - <% if (controller.class.module_parent.to_s != "Public" && policy(BroadcastRecording).destroy?) %> - <%= link_to "Hide", [broadcast.project, broadcast, recording], class: "btn-sm btn-primary ml-1 text-decoration-none", remote: true, method: :delete, data: { confirm: t('.confirm_hide') } %> - <% end %> -
    • +
  • <%= link_to(recording.download_file_name, recording.download_url, target: "_blank") %>
    • <% end %>
diff --git a/app/views/broadcasts/_video.html.erb b/app/views/broadcasts/_video.html.erb index e0e9ad2..9c44e2a 100644 --- a/app/views/broadcasts/_video.html.erb +++ b/app/views/broadcasts/_video.html.erb @@ -1,8 +1,4 @@ -<% if broadcast.director_mode_video_embed.present? && params[:director_mode].present? %> -
- <%= raw broadcast.director_mode_video_embed %> -
-<% elsif broadcast.streamer_recording? && broadcast.active? %> +<% if broadcast.streamer_recording? && broadcast.active? %>
<% else %>
@@ -16,4 +12,4 @@
-<% end %> +<% end %> \ No newline at end of file diff --git a/app/views/broadcasts/show.html.erb b/app/views/broadcasts/show.html.erb index a63ac4f..d36fccc 100644 --- a/app/views/broadcasts/show.html.erb +++ b/app/views/broadcasts/show.html.erb @@ -39,15 +39,6 @@ <%= link_to broadcast.name.titleize, broadcast.url, data: { behavior: "play_stream"}, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %> <% end %> <% end %> - <% if @broadcast.director_mode_video_embed.present? %> -
Director Mode
- <% unless params[:director_mode] %> - <%= link_to "Enable Director Mode", url_for(params.permit!.merge(director_mode: true)), class: "dropdown-item" %> - <% else %> - <%= link_to "Disable Director Mode", url_for(params.permit!.except(:director_mode)), class: "dropdown-item" %> - - <% end %> - <% end %>
Previous Sessions
<% if @recordings.any? %> diff --git a/app/views/contract_templates/_form.html.erb b/app/views/contract_templates/_form.html.erb index b11dcbd..5871713 100644 --- a/app/views/contract_templates/_form.html.erb +++ b/app/views/contract_templates/_form.html.erb @@ -2,7 +2,7 @@ <%= field_set_tag content_tag(:span, t(".release_info.heading"), class: "h6 text-muted text-uppercase") do %>
<%= form.text_field :name, wrapper_class: "col-sm-6" %> - <%= form.select :release_type, options_for_release_type_select(project, @release_type), { wrapper_class: "col-sm-6" }, data: { toggle: "collapse-select", target_show_values_mapping: { "#guardian_clause": %w(acquired_media appearance talent material misc medical), "#fee_field": %w(appearance talent location material acquired_media), "#exploitable_rights_fields": %w(appearance talent location material acquired_media), "#custom_fields": %w(medical misc), "#amendment_clause": %w(location) } }, class: "form-control custom-select" %> + <%= form.select :release_type, options_for_release_type_select(project, @release_type), { wrapper_class: "col-sm-6" }, data: { toggle: "collapse-select", target_show_values_mapping: { "#guardian_clause": %w(acquired_media appearance talent misc medical), "#fee_field": %w(appearance talent location material acquired_media), "#exploitable_rights_fields": %w(appearance talent location material acquired_media), "#custom_fields": %w(medical misc), "#amendment_clause": %w(location) } }, class: "form-control custom-select" %>
<%= form.radio_button :accessibility, :public_template, label: "Public", wrapper_class: "mr-3" %> diff --git a/app/views/directories/_file_form.html.erb b/app/views/directories/_file_form.html.erb index bd067ca..f0257fd 100644 --- a/app/views/directories/_file_form.html.erb +++ b/app/views/directories/_file_form.html.erb @@ -3,6 +3,6 @@ <%= render "shared/files_dropzone_fields", form: form, directory: directory %> <% end %>
- <%= form.submit t(".submit"), id: "upload_directory_files", class: "btn btn-block btn-success", data: { disable_with: t("shared.disable_with") } %> + <%= form.submit t(".submit"), class: "btn btn-block btn-success", data: { disable_with: t("shared.disable_with") } %>
<% end %> diff --git a/app/views/layouts/admin/application.html.erb b/app/views/layouts/admin/application.html.erb index 1ab88e9..a12ee6a 100644 --- a/app/views/layouts/admin/application.html.erb +++ b/app/views/layouts/admin/application.html.erb @@ -1,7 +1,7 @@ - MESuite.ai App + BiGMedia.ai App <%= csrf_meta_tags %> <%= csp_meta_tag %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index b2e5751..5bee701 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ - MESuite.ai App + BiGMedia.ai App <%= csrf_meta_tags %> <%= csp_meta_tag %> diff --git a/app/views/location_releases/_location_release.html.erb b/app/views/location_releases/_location_release.html.erb index 1660527..a829689 100644 --- a/app/views/location_releases/_location_release.html.erb +++ b/app/views/location_releases/_location_release.html.erb @@ -16,10 +16,10 @@ <% end %> - <%= contact_info(name: location_release.name, address: location_release.address) %> + <%= location_release.name %> - <%= contact_info_for(location_release.contact_person) %> + <%= contact_info address: location_release.address %> <%= notes_preview location_release.notes.order_by_recent %> diff --git a/app/views/location_releases/index.html.erb b/app/views/location_releases/index.html.erb index b69328f..f319ea8 100644 --- a/app/views/location_releases/index.html.erb +++ b/app/views/location_releases/index.html.erb @@ -28,12 +28,12 @@ <%= check_box_tag "location_release_ids[]", false, false %> <%= t '.table_headers.approved'%> - <%= t(".table_headers.location_info") %> - <%= t(".table_headers.owner_info") %> + <%= t(".table_headers.name") %> + <%= t(".table_headers.address") %> <%= t(".table_headers.notes") %> <%= t(".table_headers.tags") %> <%= t(".table_headers.signed_at") %> - <%= t(".table_headers.amendment_signed") %> + diff --git a/app/views/material_releases/_form.html.erb b/app/views/material_releases/_form.html.erb index ecfc028..2256596 100644 --- a/app/views/material_releases/_form.html.erb +++ b/app/views/material_releases/_form.html.erb @@ -12,9 +12,6 @@
<%= field_set_tag content_tag(:span, t(".signer_details.heading"), class: "h6 text-muted text-uppercase") do %> - <%= form.form_group :minor do %> - <%= form.check_box :minor, label: t("helpers.label.material_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %> - <% end %>
<%= form.text_field :person_first_name, wrapper_class: "col-sm-6" %> <%= form.text_field :person_last_name, wrapper_class: "col-sm-6" %> @@ -24,28 +21,6 @@ <%= form.text_field :person_title, wrapper_class: "col-sm-6" %>
<%= render "shared/address_fields", form: form, subject: "person" %> - -
!material_release.minor?) %>" data-ujs-target="guardian-fields"> - <%= card_field_set_tag t(".guardian_info.heading") do %> -
- <%= form.text_field :guardian_first_name, required: material_release.minor?, wrapper_class: "col-sm-3" %> - <%= form.text_field :guardian_last_name, required: material_release.minor?, wrapper_class: "col-sm-3" %> - <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6" %> - <%= form.text_field :guardian_email, wrapper_class: "col-sm-6" %> -
- <%= render "shared/address_fields", form: form, subject: "guardian" %> - <% end %> - - <%= card_field_set_tag t(".guardian_2_info.heading") do %> -
- <%= form.text_field :guardian_2_first_name, wrapper_class: "col-sm-3" %> - <%= form.text_field :guardian_2_last_name, wrapper_class: "col-sm-3" %> - <%= form.phone_field :guardian_2_phone, wrapper_class: "col-sm-6" %> - <%= form.text_field :guardian_2_email, wrapper_class: "col-sm-6" %> -
- <%= render "shared/address_fields", form: form, subject: "guardian_2" %> - <% end %> -
<% end %>
@@ -59,44 +34,6 @@ <%= field_set_tag content_tag(:span, t(".photos.heading"), class: "h6 text-muted text-uppercase") do %> <%= render "shared/photos_dropzone_fields", form: form, release: material_release %> - -
!material_release.minor?) %>" data-ujs-target="guardian-fields"> -
-
-

<%= t(".photos.guardian_photo.heading") %>

-
-
- No photo yet -
-
- <% if material_release.guardian_photo.attached? %> - <%= javascript_tag nonce: true do %> - App.PhotoPreview.set("#guardian-photo-preview", "<%= url_for(material_release.guardian_photo.variant(auto_orient: true, resize: '200x200')) %>"); - <% end %> - <% end %> -
- <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if material_release.guardian_photo.attached?%> - <%= form.file_field :guardian_photo, hide_label: true, data: { ujs_target: "guardian-photo-input" }, help: "PNG or JPG only", accept: material_release.class.face_photo_acceptable_content_types.join(",") %> -
- -

<%= t(".photos.guardian_2_photo.heading") %>

-
-
- No photo yet -
-
- <% if material_release.guardian_2_photo.attached? %> - <%= javascript_tag nonce: true do %> - App.PhotoPreview.set("#guardian-2-photo-preview", "<%= url_for(material_release.guardian_2_photo.variant(auto_orient: true, resize: '200x200')) %>"); - <% end %> - <% end %> -
- <%= form.hidden_field :guardian_2_photo, value: form.object.guardian_2_photo.signed_id if material_release.guardian_2_photo.attached?%> - <%= form.file_field :guardian_2_photo, hide_label: true, data: { ujs_target: "guardian-2-photo-input" }, help: "PNG or JPG only", accept: material_release.class.face_photo_acceptable_content_types.join(",") %> -
-
-
-
<% end %>
diff --git a/app/views/material_releases/_material_release.html.erb b/app/views/material_releases/_material_release.html.erb index 44c1b00..1db1c17 100644 --- a/app/views/material_releases/_material_release.html.erb +++ b/app/views/material_releases/_material_release.html.erb @@ -18,9 +18,6 @@ <%= material_release.name %> - - <%= contact_info_for(material_release.contact_person) %> - <%= notes_preview material_release.notes.order_by_recent %> diff --git a/app/views/material_releases/index.html.erb b/app/views/material_releases/index.html.erb index eaf63df..bca39db 100644 --- a/app/views/material_releases/index.html.erb +++ b/app/views/material_releases/index.html.erb @@ -29,10 +29,10 @@ <%= t '.table_headers.approved'%> <%= MaterialRelease.human_attribute_name(:name) %> - <%= t(".table_headers.owner_info") %> <%= t(".table_headers.notes") %> <%= t(".table_headers.tags") %> - <%= t(".table_headers.signed_at") %> + <%= t(".table_headers.signed_at") %> + diff --git a/app/views/profiles/show.html.erb b/app/views/profiles/show.html.erb index 0e989e8..2f4775b 100644 --- a/app/views/profiles/show.html.erb +++ b/app/views/profiles/show.html.erb @@ -17,6 +17,7 @@ <%= @user.role_for(Current.account).to_s.titleize %> <% end %>

+ <%= link_to 'Auth to Microsoft', '/auth/microsoft_graph', class: "btn btn-primary" %>
diff --git a/app/views/public/amendments/new.html.erb b/app/views/public/amendments/new.html.erb index 195aa81..24b31c3 100644 --- a/app/views/public/amendments/new.html.erb +++ b/app/views/public/amendments/new.html.erb @@ -8,10 +8,6 @@
<%= errors_summary_for @release %> <%= bootstrap_form_with model: @release, method: :post, url: public_send("account_project_contract_template_#{@contract_template.release_type}_release_amendments_path"), local: true do |form| %> - <%= card_field_set_tag t('.signed_contract_preview') do %> - " width="80%" height="1200" /> - <% end %> - <%= card_field_set_tag t(".amendment.heading") do %>

<%= @contract_template.amendment_clause %>

<% end %> diff --git a/app/views/public/material_releases/new.html.erb b/app/views/public/material_releases/new.html.erb index cb650f8..6e756e4 100644 --- a/app/views/public/material_releases/new.html.erb +++ b/app/views/public/material_releases/new.html.erb @@ -13,17 +13,6 @@
- <% unless @contract_template.guardian_clause.blank? %> - <%= form.form_group :minor do %> - <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { behavior: "update-required-status", target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %> - <% end %> - - <%= card_field_set_tag t(".guardian_clause.heading") do %> -

<%= @contract_template.guardian_clause %>

- <% end %> -
- <% end %> - <%= card_field_set_tag t(".release_info.heading") do %>
<%= form.text_field :name, required: true, wrapper_class: "col-12" %> @@ -51,91 +40,6 @@
- <% unless @contract_template.guardian_clause.blank? %> -
!@material_release.minor?) %>" data-ujs-target="guardian-fields"> - <%= card_field_set_tag t(".guardian_info.heading") do %> -
- <%= form.text_field :guardian_first_name, required: @material_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %> - <%= form.text_field :guardian_last_name, required: @material_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %> - <%= form.phone_field :guardian_phone, required: @material_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %> - <%= form.text_field :guardian_email, required: @material_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %> -
- <%= render "shared/address_fields", form: form, subject: "guardian", required: @material_release.minor?, data: { required_tag: "guardian" } %> - <% end %> - -
- - <%= card_field_set_tag t(".guardian_photo.heading") do %> -
<%= t ".guardian_photo.instructions" %>
-
-
-
- <%= t ".photo.no_photo" %> -
-
-
- <% if @material_release.guardian_photo.attached? %> - <%= javascript_tag nonce: true do %> - App.PhotoPreview.set("[data-behavior=guardian-photo-preview]", "<%= url_for(@material_release.guardian_photo.variant(auto_orient: true, resize: '200x200')) %>"); - <% end %> - <% end %> -
- <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if @material_release.guardian_photo.attached? %> - <%= form.file_field :guardian_photo, required: @material_release.minor?, hide_label: true, data: { ujs_target: "guardian-photo-input" }, accept: @material_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %> -
- <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "trigger-click", target: "[data-ujs-target=guardian-photo-input]" } %> -
-

- <%= t ".photo.warning" %> -

-
- <% end %> - -
- - <%= card_field_set_tag t(".guardian_2_info.heading") do %> -
- <%= form.text_field :guardian_2_first_name, wrapper_class: "col-sm-3" %> - <%= form.text_field :guardian_2_last_name, wrapper_class: "col-sm-3" %> - <%= form.phone_field :guardian_2_phone, wrapper_class: "col-sm-6" %> - <%= form.text_field :guardian_2_email, wrapper_class: "col-sm-6" %> -
- <%= render "shared/address_fields", form: form, subject: "guardian_2" %> - <% end %> - -
- - <%= card_field_set_tag t(".guardian_2_photo.heading") do %> -
<%= t ".guardian_2_photo.instructions" %>
-
-
-
- <%= t ".photo.no_photo" %> -
-
-
- <% if @material_release.guardian_2_photo.attached? %> - <%= javascript_tag nonce: true do %> - App.PhotoPreview.set("[data-behavior=guardian-photo-preview]", "<%= url_for(@material_release.guardian_2_photo.variant(auto_orient: true, resize: '200x200')) %>"); - <% end %> - <% end %> -
- <%= form.hidden_field :guardian_2_photo, value: form.object.guardian_2_photo.signed_id if @material_release.guardian_2_photo.attached? %> - <%= form.file_field :guardian_2_photo, hide_label: true, data: { ujs_target: "guardian-2-photo-input" }, accept: @material_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %> -
- <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "trigger-click", target: "[data-ujs-target=guardian-2-photo-input]" } %> -
-

- <%= t ".photo.warning" %> -

-
- <% end %> - -
- -
- <% end %> - <%= card_field_set_tag t(".signature.heading") do %> <%= render "shared/signature_fields", form: form, instruction: 'For Owner or Authorized Signatory', signature_legal_text: @contract_template.signature_legal_text %> <% end %> diff --git a/app/views/task_requests/splash.html.erb b/app/views/task_requests/splash.html.erb index 206c74d..98d626f 100644 --- a/app/views/task_requests/splash.html.erb +++ b/app/views/task_requests/splash.html.erb @@ -18,7 +18,15 @@
-
+ + + + + + +
+ Video tutorial will be available soon +
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb new file mode 100644 index 0000000..d85c6e7 --- /dev/null +++ b/config/initializers/omniauth.rb @@ -0,0 +1,20 @@ +ENV['AZURE_CLIENT_ID'] = 'c45b93ae-ef07-415d-b13a-ab566b877c1c' +ENV['AZURE_CLIENT_SECRET'] = 'XVboF2sRaS_H2oK6I9R56.A_exnRhiv~Xt' +ENV['AZURE_TENANT_ID'] = '1e33d1c7-dfb4-4df1-86da-62770313bcb0' +ENV['AZURE_EXTENSIONS'] = '' + +# Rails.application.config.middleware.use OmniAuth::Builder do +# provider :microsoft_graph,{ +# client_id: ENV['AZURE_CLIENT_ID'], +# client_secret: ENV['AZURE_CLIENT_SECRET'], +# tenant_id: ENV['AZURE_TENANT_ID'], +# extensions: ENV['AZURE_EXTENSIONS'], +# redirect_uri: 'https://517e57c6cd6c.ngrok.io/auth/microsoft_graph/callback', +# scope: 'openid email profile User.Read' +# } +# end + +Rails.application.config.middleware.use OmniAuth::Builder do + provider :microsoft_graph, ENV['AZURE_CLIENT_ID'], ENV['AZURE_CLIENT_SECRET'], scope: 'openid email profile User.Read' +end + diff --git a/config/locales/en.yml b/config/locales/en.yml index fd67d6c..46f0db3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -67,7 +67,6 @@ en: notes: Notes signed_at: Date Signed tags: Tags - owner_info: Owner Info new: heading: Import Acquired Media Release update: @@ -112,11 +111,6 @@ en: application: header: sign_out: Sign Out - broadcasts: - edit: - heading: Edit Broadcast - update: - notice: The broadcast has been updated task_requests: index: empty: Task requests will appear here @@ -224,8 +218,6 @@ en: broadcast: actions: manage: Manage - broadcast_recordings: - confirm_hide: Are you sure you want to hide this recording from everyone? create: notice: A live stream has been created destroy: @@ -519,8 +511,6 @@ en: person_last_name: Last name person_name: Name person_phone: Phone number - contract_template: - amendment_clause: Additional Contract Clause location_release: address_city: City address_country: Country @@ -541,27 +531,6 @@ en: person_last_name: Owner last name material_release: description: Description of licensed material - guardian_2_address_city: Guardian 2 city - guardian_2_address_country: Guardian 2 country - guardian_2_address_state: Guardian 2 state - guardian_2_address_street1: Guardian 2 address - guardian_2_address_street2: Guardian 2 address (Line 2) - guardian_2_address_zip: Guardian 2 zip code - guardian_2_email: Guardian 2 email - guardian_2_first_name: Guardian 2 first name - guardian_2_last_name: Guardian 2 last name - guardian_2_phone: Guardian 2 phone - guardian_address_city: Guardian city - guardian_address_country: Guardian country - guardian_address_state: Guardian state - guardian_address_street1: Guardian address - guardian_address_street2: Guardian address (Line 2) - guardian_address_zip: Guardian zip code - guardian_email: Guardian email - guardian_first_name: Guardian first name - guardian_last_name: Guardian last name - guardian_phone: Guardian phone - minor: Is the person a minor? name: Name of licensed material person_address: Address person_address_city: City @@ -852,18 +821,16 @@ en: empty: Location Releases will appear here table_headers: address: Address - amendment_signed: Additional Clause approved: Approved - location_info: Location Info + name: Location Name notes: Notes - owner_info: Owner Info signed_at: Date Signed tags: Tags location_release: actions: manage: Manage review: Review - sign_amendment: Sign Additional Clause + sign_amendment: Sign Amendment messages: amendment_not_signed_tooltip: Amendment not yet signed amendment_signed_tooltip: Amendment Signed @@ -883,18 +850,10 @@ en: form: contract_and_rights: heading: 3 of 4 Contract & Exploitable Rights - guardian_2_info: - heading: Second Guardian Information (if company requires) - guardian_info: - heading: Guardian Information material_details: heading: 1 of 3 Material Details photos: dropzone_label: Tap to take a photo of Licensed Material (optional) - guardian_2_photo: - heading: Second Guardian Photo - guardian_photo: - heading: Guardian Photo heading: 4 of 4 Photos signer_details: heading: 2 of 4 Licensor/Owner Details @@ -907,7 +866,6 @@ en: approved: Approved name: Name notes: Notes - owner_info: Owner Info signed_at: Date Signed tags: Tags material_release: @@ -1146,11 +1104,10 @@ en: amendment_signed_message: Release amendment signed successfully! Thank you new: amendment: - heading: Additional Clause + heading: Amendment copy_url: Copy sign amendment URL signature: heading: Signature - signed_contract_preview: Signed Contract Preview appearance_releases: create: notice: Your release has been signed. Thank you! @@ -1224,27 +1181,10 @@ en: cancel: Cancel contact_info: heading: Licensor/Owner Contact Information - guardian_2_info: - heading: Second Guardian Information (if company requires) - guardian_2_photo: - heading: Second Guardian Photo - instructions: > - Lastly, it's time for second guardian to take a selfie photo! Please remove your hat and sunglasses (regular eyewear is ok), make sure that you are the only person in the photo, look straight into the camera, and say Cheese! - guardian_clause: - heading: Guardian Clause - guardian_info: - heading: Guardian Information - guardian_photo: - heading: Guardian Photo - instructions: > - Lastly, it's time for guardian to take a selfie photo! Please remove your hat and sunglasses (regular eyewear is ok), make sure that you are the only person in the photo, look straight into the camera, and say Cheese! legal: heading: Legal photo: heading: Photos - no_photo: No photo yet - take_photo: Take Photo - warning: If your photo appears sideways, it will be autocorrected when you submit your release. release_info: heading: Release Information signature: diff --git a/config/locales/es.yml b/config/locales/es.yml index fca74aa..db3048b 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -21,7 +21,6 @@ es: notes: Notes (ES) signed_at: Date Signed (ES) tags: Tags (ES) - owner_info: Owner Info (ES) activerecord: attributes: appearance_release: @@ -286,31 +285,6 @@ es: person_email: Dirección de correo electrónico person_name: Nómbre person_phone: Número de teléfono - contract_template: - amendment_clause: Additional Contract Clause (ES) - material_release: - guardian_2_address_city: Guardian 2 city (ES) - guardian_2_address_country: Guardian 2 country (ES) - guardian_2_address_state: Guardian 2 state (ES) - guardian_2_address_street1: Guardian 2 address (ES) - guardian_2_address_street2: Guardian 2 address (Line 2) (ES) - guardian_2_address_zip: Guardian 2 zip code (ES) - guardian_2_email: Guardian 2 email (ES) - guardian_2_first_name: Guardian 2 first name (ES) - guardian_2_last_name: Guardian 2 last name (ES) - guardian_2_phone: Guardian 2 phone (ES) - guardian_address_city: Guardian city (ES) - guardian_address_country: Guardian country (ES) - guardian_address_state: Guardian state (ES) - guardian_address_street1: Dirección del tutor legal - guardian_address_street2: Dirección del tutor legal (Línea 2) - guardian_address_zip: Guardian zip code (ES) - guardian_email: Guardian email (ES) - guardian_first_name: Guardian first name (ES) - guardian_last_name: Guardian last name (ES) - guardian_name: Nómbre del tutor legal - guardian_phone: Número de teléfono del tutor legal - minor: El firmante es un menor medical_release: guardian_2_address_city: Guardian 2 city (ES) guardian_2_address_country: Guardian 2 country (ES) @@ -399,8 +373,6 @@ es: contract_template: update: Save changes (ES) create: 'Crear %{model}' - material_release: - create: Import Release (ES) medical_release: update: Approve (ES) update: 'Actualizar %{model}' @@ -411,35 +383,23 @@ es: index: table_headers: address: Address (ES) - amendment_signed: Additional Clause (ES) notes: Notes (ES) signed_at: Date Signed (ES) tags: Tags (ES) location_release: actions: - sign_amendment: Sign Additional Clause (ES) + sign_amendment: Sign Amendment (ES) messages: amendment_not_signed_tooltip: Amendment not yet signed (ES) amendment_signed_tooltip: Amendment Signed (ES) material_releases: - create: - notice: The acquired media release has been created (ES) form: - guardian_2_info: - heading: Guardian Information (if company requires) [ES] - guardian_info: - heading: Guardian Information (ES) photos: dropzone_label: Tap to take a photo of Licensed Material (optional) (ES) - guardian_2_photo: - heading: Second Guardian Photo - guardian_photo: - heading: Guardian Photo index: table_headers: name: Name (ES) notes: Notes (ES) - owner_info: Owner Info signed_at: Date Signed (ES) tags: Tags (ES) medical_releases: @@ -504,11 +464,10 @@ es: amendment_signed_message: Release amendment signed successfully! Thank you (ES) new: amendment: - heading: Additional Clause (ES) + heading: Amendment copy_url: Copy sign amendment URL (ES) signature: heading: Signature (ES) - signed_contract_preview: Signed Contract Preview (ES) appearance_releases: create: notice: La autorización está firmada. ¡Gracias! @@ -548,25 +507,8 @@ es: heading: Photos (ES) material_releases: new: - guardian_2_info: - heading: Second Guardian Information (if company requires) [ES] - guardian_2_photo: - heading: Second Guardian Photo (ES) - instructions: > - (ES) Lastly, it's time for second guardian to take a selfie photo! Please remove your hat and sunglasses (regular eyewear is ok), make sure that you are the only person in the photo, look straight into the camera, and say Cheese! (ES) - guardian_clause: - heading: Guardian Clause (ES) - guardian_info: - heading: Guardian Information (ES) - guardian_photo: - heading: Guardian Photo (ES) - instructions: > - (ES) Lastly, it's time for guardian to take a selfie photo! Please remove your hat and sunglasses (regular eyewear is ok), make sure that you are the only person in the photo, look straight into the camera, and say Cheese! (ES) photo: heading: Photos (ES) - no_photo: No photo yet (ES) - take_photo: Take Photo (ES) - warning: If your photo appears sideways, it will be autocorrected when you submit your release. (ES) medical_releases: new: guardian_2_info: diff --git a/config/routes.rb b/config/routes.rb index 534fa25..e18fa00 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,8 @@ require 'sidekiq/web' Rails.application.routes.draw do AVAILABLE_LOCALES_REGEX = /#{I18n.available_locales.join("|")}/.freeze + get 'auth/microsoft_graph/callback', to: 'callbacks#create' + concern :confirmable do resources :video_release_confirmations, only: [:new, :create, :destroy] end @@ -35,7 +37,6 @@ Rails.application.routes.draw do resource :masquerade, only: :create end resources :task_requests, only: [:index, :edit, :update, :show] - resources :broadcasts, only: [:edit, :update] root to: "accounts#index", as: :signed_in_root end @@ -101,7 +102,6 @@ Rails.application.routes.draw do delete :destroy_file end resource :zoom_meeting, only: [:show] - resources :broadcast_recordings, only: :destroy end resources :directories, except: [:index] do member do @@ -160,7 +160,6 @@ Rails.application.routes.draw do scope 'v1' do get 'sync' => 'sync#index' post 'user_token' => 'user_token#create' - post 'users' => 'users#create' resource :profiles, only: [:show] resources :projects, only: [:index] do resources :broadcasts, only: [:index, :show, :update] diff --git a/db/migrate/20200724084722_add_hidden_field_to_broadcast_recordings.rb b/db/migrate/20200724084722_add_hidden_field_to_broadcast_recordings.rb deleted file mode 100644 index 7e61108..0000000 --- a/db/migrate/20200724084722_add_hidden_field_to_broadcast_recordings.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddHiddenFieldToBroadcastRecordings < ActiveRecord::Migration[6.0] - def change - add_column :broadcast_recordings, :hidden, :boolean, default: false - end -end diff --git a/db/migrate/20200727143209_add_guardians_fields_to_material_releases.rb b/db/migrate/20200727143209_add_guardians_fields_to_material_releases.rb deleted file mode 100644 index 8a06faf..0000000 --- a/db/migrate/20200727143209_add_guardians_fields_to_material_releases.rb +++ /dev/null @@ -1,25 +0,0 @@ -class AddGuardiansFieldsToMaterialReleases < ActiveRecord::Migration[6.0] - def change - add_column :material_releases, :minor, :boolean, default: false - add_column :material_releases, :guardian_first_name, :string - add_column :material_releases, :guardian_last_name, :string - add_column :material_releases, :guardian_email, :string - add_column :material_releases, :guardian_phone, :string - add_column :material_releases, :guardian_address_street1, :string - add_column :material_releases, :guardian_address_street2, :string - add_column :material_releases, :guardian_address_city, :string - add_column :material_releases, :guardian_address_state, :string - add_column :material_releases, :guardian_address_zip, :string - add_column :material_releases, :guardian_address_country, :string - add_column :material_releases, :guardian_2_first_name, :string - add_column :material_releases, :guardian_2_last_name, :string - add_column :material_releases, :guardian_2_email, :string - add_column :material_releases, :guardian_2_phone, :string - add_column :material_releases, :guardian_2_address_street1, :string - add_column :material_releases, :guardian_2_address_street2, :string - add_column :material_releases, :guardian_2_address_city, :string - add_column :material_releases, :guardian_2_address_state, :string - add_column :material_releases, :guardian_2_address_zip, :string - add_column :material_releases, :guardian_2_address_country, :string - end -end \ No newline at end of file diff --git a/db/migrate/20200730050903_add_stream_and_key_override_to_broadcasts.rb b/db/migrate/20200730050903_add_stream_and_key_override_to_broadcasts.rb deleted file mode 100644 index 2caec9a..0000000 --- a/db/migrate/20200730050903_add_stream_and_key_override_to_broadcasts.rb +++ /dev/null @@ -1,7 +0,0 @@ -class AddStreamAndKeyOverrideToBroadcasts < ActiveRecord::Migration[6.0] - def change - add_column :broadcasts, :stream_url_override, :string - add_column :broadcasts, :stream_key_override, :string - add_column :broadcasts, :youtube_uid, :string - end -end diff --git a/db/migrate/20200803145912_remove_youtube_uid_from_broadcasts.rb b/db/migrate/20200803145912_remove_youtube_uid_from_broadcasts.rb deleted file mode 100644 index a598496..0000000 --- a/db/migrate/20200803145912_remove_youtube_uid_from_broadcasts.rb +++ /dev/null @@ -1,5 +0,0 @@ -class RemoveYoutubeUidFromBroadcasts < ActiveRecord::Migration[6.0] - def change - remove_column :broadcasts, :youtube_uid, :string - end -end diff --git a/db/migrate/20200803150138_add_director_mode_video_embed_to_broadcasts.rb b/db/migrate/20200803150138_add_director_mode_video_embed_to_broadcasts.rb deleted file mode 100644 index d9c1287..0000000 --- a/db/migrate/20200803150138_add_director_mode_video_embed_to_broadcasts.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddDirectorModeVideoEmbedToBroadcasts < ActiveRecord::Migration[6.0] - def change - add_column :broadcasts, :director_mode_video_embed, :text - end -end diff --git a/db/structure.sql b/db/structure.sql index 6a85008..fce0e15 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -9,20 +9,6 @@ SET xmloption = content; SET client_min_messages = warning; SET row_security = off; --- --- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: - --- - -CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog; - - --- --- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: - --- - -COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language'; - - -- -- Name: fuzzystrmatch; Type: EXTENSION; Schema: -; Owner: - -- @@ -536,8 +522,7 @@ CREATE TABLE public.broadcast_recordings ( file_name character varying NOT NULL, created_at timestamp(6) without time zone NOT NULL, updated_at timestamp(6) without time zone NOT NULL, - duration double precision, - hidden boolean DEFAULT false + duration double precision ); @@ -577,10 +562,7 @@ CREATE TABLE public.broadcasts ( token character varying, streamer_status integer DEFAULT 0, shoot_location_time_zone character varying DEFAULT 'UTC'::character varying, - full_live_stream_playback_uid character varying, - stream_url_override character varying, - stream_key_override character varying, - director_mode_video_embed text + full_live_stream_playback_uid character varying ); @@ -1020,28 +1002,7 @@ CREATE TABLE public.material_releases ( person_last_name character varying, approved_by_user_name text, approved_by_user_email text, - approved_at timestamp without time zone, - minor boolean DEFAULT false, - guardian_first_name character varying, - guardian_last_name character varying, - guardian_email character varying, - guardian_phone character varying, - guardian_address_street1 character varying, - guardian_address_street2 character varying, - guardian_address_city character varying, - guardian_address_state character varying, - guardian_address_zip character varying, - guardian_address_country character varying, - guardian_2_first_name character varying, - guardian_2_last_name character varying, - guardian_2_email character varying, - guardian_2_phone character varying, - guardian_2_address_street1 character varying, - guardian_2_address_street2 character varying, - guardian_2_address_city character varying, - guardian_2_address_state character varying, - guardian_2_address_zip character varying, - guardian_2_address_country character varying + approved_at timestamp without time zone ); @@ -1479,6 +1440,7 @@ CREATE TABLE public.settings ( -- CREATE SEQUENCE public.settings_id_seq + AS integer START WITH 1 INCREMENT BY 1 NO MINVALUE @@ -1514,6 +1476,7 @@ CREATE TABLE public.taggings ( -- CREATE SEQUENCE public.taggings_id_seq + AS integer START WITH 1 INCREMENT BY 1 NO MINVALUE @@ -1544,6 +1507,7 @@ CREATE TABLE public.tags ( -- CREATE SEQUENCE public.tags_id_seq + AS integer START WITH 1 INCREMENT BY 1 NO MINVALUE @@ -4002,11 +3966,6 @@ INSERT INTO "schema_migrations" (version) VALUES ('20200720051634'), ('20200720131309'), ('20200721140821'), -('20200724084722'), -('20200725231419'), -('20200727143209'), -('20200730050903'), -('20200803145912'), -('20200803150138'); +('20200725231419'); diff --git a/lib/knock_monkeypatch.rb b/lib/knock_monkeypatch.rb deleted file mode 100644 index ade5f2c..0000000 --- a/lib/knock_monkeypatch.rb +++ /dev/null @@ -1,7 +0,0 @@ -module Knock - class AuthTokenController < ApplicationController - skip_before_action :authenticate - alias authenticate_with_token authenticate - before_action :authenticate_with_token - end -end \ No newline at end of file diff --git a/spec/channels/broadcasts_channel_spec.rb b/spec/channels/broadcasts_channel_spec.rb index 2d350be..a540e3f 100644 --- a/spec/channels/broadcasts_channel_spec.rb +++ b/spec/channels/broadcasts_channel_spec.rb @@ -35,7 +35,7 @@ RSpec.describe BroadcastsChannel, type: :channel do describe '#stream_recording_ready' do it 'broadcasts to the channel with the right data' do create_list(:broadcast_recording, 1, broadcast: broadcast) - recordings = broadcast.broadcast_recordings.visible.paginate(page: 1) + recordings = broadcast.broadcast_recordings.paginate(page: 1) flash_message = OpenStruct.new(notice: 'Hello world', alert: nil) flash_content = ApplicationController.render partial: 'application/flash', locals: { flash: flash_message } recordings_content = ApplicationController.render partial: 'broadcasts/broadcast_recordings', locals: { recordings: recordings, broadcast: broadcast } diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb index da854b8..61f6cd6 100644 --- a/spec/controllers/admin/accounts_controller_spec.rb +++ b/spec/controllers/admin/accounts_controller_spec.rb @@ -116,16 +116,6 @@ RSpec.describe Admin::AccountsController, type: :controller do expect(response.body).to have_link("2", href: admin_account_path(current_user.primary_account, page: 2)) end - it "paginates the broadcast list" do - allow(MuxLiveStream).to receive(:new).and_return(double(id: "id", key: "key", playback_id: "playback_id")) - project = create(:project, account: current_user.primary_account) - create_list(:broadcast, 20, project: project ) - - get :show, params: { id: current_user.primary_account } - - expect(response.body).to have_link("2", href: admin_account_path(current_user.primary_account, page: 2)) - end - it "filters the videos by a query param" do project = create(:project, account: current_user.primary_account) create(:video, project: project, name: "First video") diff --git a/spec/controllers/admin/broadcasts_controller_spec.rb b/spec/controllers/admin/broadcasts_controller_spec.rb deleted file mode 100644 index db240dc..0000000 --- a/spec/controllers/admin/broadcasts_controller_spec.rb +++ /dev/null @@ -1,77 +0,0 @@ -require "rails_helper" - -RSpec.describe Admin::BroadcastsController, type: :controller do - render_views - - let!(:current_user) { create(:user, :admin) } - - before do - sign_in(current_user) - allow(MuxLiveStream).to receive(:new).and_return(double(id: "id", key: "key", playback_id: "playback_id")) - end - - describe "#edit" do - let(:broadcast) { create(:broadcast) } - - it "returns a successful response" do - get :edit, params: { id: broadcast } - - expect(response).to be_successful - end - - it "assigns broadcast" do - get :edit, params: { id: broadcast } - - expect(assigns(:broadcast)).to eq broadcast - end - end - - describe "#update" do - let(:broadcast) { create(:broadcast) } - - it "redirects to broadcasts page" do - patch :update, params: { id: broadcast, broadcast: broadcast_update_params } - - expect(response).to be_redirect - expect(response).to redirect_to [:admin, broadcast.project.account] - end - - it "sets a flash notice" do - patch :update, params: { id: broadcast, broadcast: broadcast_update_params } - - expect(flash.notice).to eq "The broadcast has been updated" - end - - it "updates the broadcast record" do - patch :update, params: { id: broadcast, broadcast: broadcast_update_params } - - expect(assigns(:broadcast)).to have_attributes( - stream_url_override: "https://example.com/streams/abcd", - stream_key_override: "abcdef", - ) - end - - context "when record cannot be saved" do - before do - allow_any_instance_of(Broadcast).to receive(:update).and_return(false) - end - - it "re-displays the form" do - patch :update, params: { id: broadcast, broadcast: broadcast_update_params } - - expect(response).to be_successful - expect(flash.notice).to be_nil - end - end - end - - private - - def broadcast_update_params - { - stream_url_override: "https://example.com/streams/abcd", - stream_key_override: "abcdef", - director_mode_video_embed: "", - } - end -end diff --git a/spec/controllers/api/sync_controller_spec.rb b/spec/controllers/api/sync_controller_spec.rb index c070b6e..f34878a 100644 --- a/spec/controllers/api/sync_controller_spec.rb +++ b/spec/controllers/api/sync_controller_spec.rb @@ -94,7 +94,7 @@ RSpec.describe Api::SyncController, type: :controller do expect(appearance_releases.first).to include('guardian_photo') expect(talent_releases.first).to include('guardian_photo') expect(location_releases.first).not_to include('guardian_photo') - expect(material_releases.first).to include('guardian_photo') + expect(material_releases.first).not_to include('guardian_photo') end it 'guardian photo has same format as other photos' do diff --git a/spec/controllers/api/user_token_controller_spec.rb b/spec/controllers/api/user_token_controller_spec.rb deleted file mode 100644 index cb01e35..0000000 --- a/spec/controllers/api/user_token_controller_spec.rb +++ /dev/null @@ -1,63 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe Api::UserTokenController, type: :request do - let(:current_user) { create(:user) } - - describe '#create' do - it 'returns error if credentials are not corrent and does not set cookie' do - - post create_endpoint, params: wrong_auth_params - - expect(response).to be_successful - expect(response.body).to match record_not_found - expect(cookie_data).to eq nil - end - - it 'sends token and cookie if credentials are correct' do - post create_endpoint, params: correct_auth_params - - expect(response).to be_successful - expect(response.body).not_to match record_not_found - expect(response.body).to match token_response - expect(cookie_data).not_to eq nil - end - end - - private - - def wrong_auth_params - { - auth: { - email: 'wrong_email@api-test.com', - password: 'password' - } - } - end - - def correct_auth_params - { - auth: { - email: current_user.email, - password: 'password' - } - } - end - - def create_endpoint - '/api/v1/user_token' - end - - def record_not_found - /Record not found/ - end - - def token_response - /jwt/ - end - - def cookie_data - cookies[:_easy_release_session] - end -end diff --git a/spec/controllers/api/users_controller_spec.rb b/spec/controllers/api/users_controller_spec.rb deleted file mode 100644 index e785c73..0000000 --- a/spec/controllers/api/users_controller_spec.rb +++ /dev/null @@ -1,78 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe Api::UsersController, type: :controller do - before do - ENV['CUSTOM_API_TOKEN'] = "custom_token" - end - describe '#create' do - context 'Invalid token' do - it 'Returns 401 (Unauthorized) status if token is not valid' do - - post :create - - expect(response).not_to be_successful - expect(response).to have_http_status(401) - end - end - - context 'Valid token' do - before :each do - controller.request.env['HTTP_AUTHORIZATION'] = 'Bearer custom_token' - end - - it 'Returns Server error if user param is missing' do - user_count = User.all.count - - expect do - post :create - end.to raise_exception ActionController::ParameterMissing - - expect(User.all.count).to eq user_count - end - - it 'Returns Server Error if email or password is missing' do - user_count = User.all.count - - expect do - post :create, params: { user: { email: "a@b.com" } } - end.to raise_exception ActionController::ParameterMissing - - expect do - post :create, params: { user: { password: "123" } } - end.to raise_exception ActionController::ParameterMissing - - expect(User.all.count).to eq user_count - end - - it 'Returns Server Error if body contains not permitted params' do - user_count = User.all.count - - expect do - post :create, params: { user: { email: "a@b.com", password: "123", admin: true } } - end.to raise_exception ActionController::UnpermittedParameters - - expect(User.all.count).to eq user_count - end - - it 'Creates user if body contains correct params' do - expect do - post :create, params: { user: { email: "a@b.com", password: "123" } } - end.to change(User, :count).by(1) - - expect(response).to be_successful - end - - it 'Nothing changes if existing email is used' do - create(:user, email: "a@b.com") - - expect do - post :create, params: { user: { email: "a@b.com", password: "123" } } - end.not_to change(User, :count) - - expect(response).to be_successful - end - end - end -end diff --git a/spec/controllers/broadcast_recordings_controller_spec.rb b/spec/controllers/broadcast_recordings_controller_spec.rb deleted file mode 100644 index 28e7ab9..0000000 --- a/spec/controllers/broadcast_recordings_controller_spec.rb +++ /dev/null @@ -1,30 +0,0 @@ -require 'rails_helper' - -RSpec.describe BroadcastRecordingsController, type: :controller do - render_views - - let(:user) { create(:user) } - let(:account) { user.primary_account } - let(:project) { create(:project, account: user.primary_account) } - - before do - sign_in user - end - - describe "#destroy" do - let(:broadcast) { create(:broadcast, project: project, name: "New Broadcast") } - let(:recording) { create(:broadcast_recording, broadcast: broadcast) } - - before do - allow(MuxLiveStream).to receive(:new).and_return(double(id: "id", key: "key", playback_id: "playback_id")) - end - - it "hides the broadcast recording" do - expect(recording.hidden).to be false - - post :destroy, params: { project_id: project, broadcast_id: broadcast, id: recording }, xhr: true - - expect(recording.reload.hidden).to be true - end - end -end diff --git a/spec/controllers/broadcasts_controller_spec.rb b/spec/controllers/broadcasts_controller_spec.rb index 8d08f2e..ed37ad2 100644 --- a/spec/controllers/broadcasts_controller_spec.rb +++ b/spec/controllers/broadcasts_controller_spec.rb @@ -184,35 +184,6 @@ RSpec.describe BroadcastsController, type: :controller do expect(response.body).to have_selector(".dropdown-menu a.dropdown-item", text: recording.download_file_name) end end - - context "when virtual director video embed is available" do - let(:broadcast) { create(:broadcast, project: project, name: "Another Broadcast", - director_mode_video_embed: "") } - - it "renders the view dropdown with a director mode enable option" do - get :show, params: { project_id: project, id: broadcast } - - expect(response.body).to have_content "Switch View" - expect(response.body).to have_selector(".dropdown-menu h5.dropdown-header", text: "Director Mode") - expect(response.body).to have_selector(".dropdown-menu a.dropdown-item", text: "Enable Director Mode") - end - - context "when director mode is enabled" do - it "shows the video embed" do - get :show, params: { project_id: project, id: broadcast, director_mode: true } - - expect(response.body).to have_selector("iframe", text: "video player") - end - - it "renders the view dropdown with a director mode disable option" do - get :show, params: { project_id: project, id: broadcast, director_mode: true } - - expect(response.body).to have_content "Switch View" - expect(response.body).to have_selector(".dropdown-menu h5.dropdown-header", text: "Director Mode") - expect(response.body).to have_selector(".dropdown-menu a.dropdown-item", text: "Disable Director Mode") - end - end - end end describe "#update" do diff --git a/spec/factories/acquired_media_releases.rb b/spec/factories/acquired_media_releases.rb index b45c57e..952f049 100644 --- a/spec/factories/acquired_media_releases.rb +++ b/spec/factories/acquired_media_releases.rb @@ -4,22 +4,6 @@ FactoryBot.define do name "Test Acquired Media Release" - trait :with_address do - person_address_street1 "St1" - person_address_street2 "St2" - person_address_city "City" - person_address_state "State" - person_address_zip "123" - person_address_country "US" - end - - trait :with_owner_info do - person_first_name "Jane" - person_last_name "Doe" - person_phone "100-555-1001" - person_email "owner@email.com" - end - trait :native do signature do path = Rails.root.join("spec", "fixtures", "files", "signature.png") diff --git a/spec/factories/broadcast_recordings.rb b/spec/factories/broadcast_recordings.rb index a30bf80..1cead9a 100644 --- a/spec/factories/broadcast_recordings.rb +++ b/spec/factories/broadcast_recordings.rb @@ -3,7 +3,6 @@ FactoryBot.define do association :broadcast file_name "high.mp4" asset_uid "asset_uid" - asset_playback_uid "asset_playback_uid" - hidden { false } + asset_playback_uid "asset_playback_uid" end end diff --git a/spec/factories/broadcasts.rb b/spec/factories/broadcasts.rb index d077ba8..4148242 100644 --- a/spec/factories/broadcasts.rb +++ b/spec/factories/broadcasts.rb @@ -16,17 +16,6 @@ FactoryBot.define do streamer_status "idle" end - trait :with_overriden_stream do - stream_uid "mux_stream" - stream_key "mux_key" - stream_playback_uid "mux_playback_id" - full_live_stream_playback_uid "full_live_stream_playback_uid" - status "created" - streamer_status "idle" - stream_url_override "overriden_stream_url" - stream_key_override "overriden_stream_key" - end - trait :with_files do files do [ diff --git a/spec/factories/material_releases.rb b/spec/factories/material_releases.rb index c5ebb17..d4ac6d5 100644 --- a/spec/factories/material_releases.rb +++ b/spec/factories/material_releases.rb @@ -4,20 +4,10 @@ FactoryBot.define do name "Test Materials" - trait :with_address do - person_address_street1 "St1" - person_address_street2 "St2" - person_address_city "City" - person_address_state "State" - person_address_zip "123" - person_address_country "US" - end - trait :native do person_first_name "Jane" person_last_name "Doe" person_phone "100-555-1001" - person_email "owner@email.com" signature do path = Rails.root.join("spec", "fixtures", "files", "signature.png") @@ -25,16 +15,6 @@ FactoryBot.define do end end - trait :minor do - minor true - guardian_first_name "Guardian1" - guardian_last_name "First" - guardian_2_first_name "Guardian2" - guardian_2_last_name "Second" - guardian_phone "1111" - guardian_2_phone "2222" - end - trait :with_photo do photos do path = Rails.root.join("spec", "fixtures", "files", "material_photo.png") diff --git a/spec/features/user_manages_contract_templates_spec.rb b/spec/features/user_manages_contract_templates_spec.rb index 6c90ff8..c2c1bcb 100644 --- a/spec/features/user_manages_contract_templates_spec.rb +++ b/spec/features/user_manages_contract_templates_spec.rb @@ -178,7 +178,7 @@ RSpec.feature 'User manages contract templates', type: :feature do expect(content_disposition).to include('inline') expect(pdf_body).to have_content('PREVIEW ONLY') expect(pdf_body).to have_content('Material Release') - expect(pdf_body).to have_content('Guardian') + expect(pdf_body).not_to have_content('Guardian') end context 'preventing creation of release template with wrong fee value' do diff --git a/spec/features/user_manages_project_directories_spec.rb b/spec/features/user_manages_project_directories_spec.rb index 6af2448..6ad5bc3 100644 --- a/spec/features/user_manages_project_directories_spec.rb +++ b/spec/features/user_manages_project_directories_spec.rb @@ -51,13 +51,6 @@ RSpec.feature "User manages project custom folders", type: :feature do expect(page).to have_content("UPLOAD NEW FILES") - expect do - click_button "Upload Files" - end.not_to raise_exception - - expect(page).to have_content("UPLOAD NEW FILES") - expect(page).not_to have_content("The folder has been updated") - drop_file Rails.root.join(file_fixture("person_photo.png")), type: :dropzone click_button "Upload Files" diff --git a/spec/features/user_managing_acquired_media_releases_spec.rb b/spec/features/user_managing_acquired_media_releases_spec.rb index 0d4484d..61ac8c8 100644 --- a/spec/features/user_managing_acquired_media_releases_spec.rb +++ b/spec/features/user_managing_acquired_media_releases_spec.rb @@ -165,24 +165,6 @@ feature "User managing acquired_media releases" do sign_in current_user end - scenario "index table shows owner info" do - release = create(:acquired_media_release, :with_owner_info, :with_address, project: project) - - visit project_acquired_media_releases_path(project) - - expect(page).to have_content owner_info_table_header - - expect(page).to have_content release.person_first_name - expect(page).to have_content release.person_last_name - expect(page).to have_content release.person_phone - expect(page).to have_content release.person_email - expect(page).to have_content release.person_address_street1 - expect(page).to have_content release.person_address_city - expect(page).to have_content release.person_address_state - expect(page).to have_content release.person_address_zip - expect(page).to have_content release.person_address_country - end - scenario "creating a release for an adult", js: true do visit new_project_acquired_media_release_path(project) @@ -280,63 +262,62 @@ feature "User managing acquired_media releases" do end scenario "creating, updating, destroying a release", js: true do - resize_window_to(1_000, 1_000) do - release_data = { - name: "Test Acquired Media Release", - applicable_media: ApplicableMedium.last.label, - territory: Territory.last.label, - term: Term.last.label, - restriction: Restriction.first.label, - restriction_text: "Not available in China", - } + release_data = { + name: "Test Acquired Media Release", + applicable_media: ApplicableMedium.last.label, + territory: Territory.last.label, + term: Term.last.label, + restriction: Restriction.first.label, + restriction_text: "Not available in China", + } - sign_in current_user - visit new_project_acquired_media_release_path(project) + sign_in current_user + visit new_project_acquired_media_release_path(project) - by "attaching only a contract" do - attach_file contract_field, Rails.root.join(file_fixture("contract.pdf")), visible: false - click_button create_release_button + by "attaching only a contract" do + attach_file contract_field, Rails.root.join(file_fixture("contract.pdf")), visible: false + click_button create_release_button - expect(page).to have_invalid_field(acquired_media_name_field) + expect(page).to have_invalid_field(acquired_media_name_field) + end + + by "attaching files" do + drop_file Rails.root.join(file_fixture("video_file.mp4")), type: "file-info-dropzone" + click_button create_release_button + + expect(page).to have_invalid_field(acquired_media_name_field) + end + + by "filling out the remaining information" do + fill_in_release_fields release_data + click_button create_release_button + + expect(page).to have_content(create_release_notice) + expect(page).to have_content("1") + + click_on "Manage" + expect(page).to have_link("Download") + end + + it_also "updates an existing release" do + click_link "Edit" + + within ".dropzone" do + expect(page).to have_filename("video_file.mp4") end - by "attaching files" do - drop_file Rails.root.join(file_fixture("video_file.mp4")), type: "file-info-dropzone" - click_button create_release_button + expect(page).to have_filled_in_data(release_data) - expect(page).to have_invalid_field(acquired_media_name_field) - end + fill_in_release_fields name: "New name" + drop_file Rails.root.join(file_fixture("person_photo.png")), type: "file-info-dropzone" + click_button update_release_button - by "filling out the remaining information" do - fill_in_release_fields release_data - click_button create_release_button + expect(page).to have_content(update_release_notice) + expect(page).to have_content("New name") + expect(page).to have_content("2") + end - expect(page).to have_content(create_release_notice) - expect(page).to have_content("1") - - click_on "Manage" - expect(page).to have_link("Download") - end - - it_also "updates an existing release" do - click_link "Edit" - - within ".dropzone" do - expect(page).to have_filename("video_file.mp4") - end - - expect(page).to have_filled_in_data(release_data) - - fill_in_release_fields name: "New name" - drop_file Rails.root.join(file_fixture("person_photo.png")), type: "file-info-dropzone" - click_button update_release_button - - expect(page).to have_content(update_release_notice) - expect(page).to have_content("New name") - expect(page).to have_content("2") - end - - it_also "deletes an existing release" do + it_also "deletes an existing release" do click_button "Manage" accept_alert do click_link "Delete" @@ -344,7 +325,6 @@ feature "User managing acquired_media releases" do expect(page).not_to have_content("New name") end - end end scenario "viewing the contract PDF for an adult" do @@ -856,8 +836,4 @@ feature "User managing acquired_media releases" do def successful_import_message t 'acquired_media_releases.create.notice' end - - def owner_info_table_header - t 'acquired_media_releases.index.table_headers.owner_info' - end end diff --git a/spec/features/user_managing_broadcasts_spec.rb b/spec/features/user_managing_broadcasts_spec.rb index 5908096..b4acf4e 100644 --- a/spec/features/user_managing_broadcasts_spec.rb +++ b/spec/features/user_managing_broadcasts_spec.rb @@ -3,7 +3,6 @@ require 'rails_helper' feature 'User managing broadcasts' do - let(:current_user) { create(:user, :manager) } let(:project) { create(:project, members: current_user, account: current_user.primary_account) } @@ -51,7 +50,7 @@ feature 'User managing broadcasts' do scenario 'visit show page of broadcast', js: true do broadcast = create(:broadcast, :with_stream, :with_files, project: project) - recording = create(:broadcast_recording, broadcast: broadcast, asset_uid: "asset_uid_1") + recording = create(:broadcast_recording, broadcast: broadcast) visit project_broadcast_path(project, broadcast) @@ -205,24 +204,6 @@ feature 'User managing broadcasts' do end end - scenario 'project manager can hide broadcast recordings', js: true do - broadcast = create(:broadcast, :with_stream, :with_files, project: project) - recording = create(:broadcast_recording, broadcast: broadcast, asset_uid: "another_asset_uid") - - visit project_broadcast_path(project, broadcast) - - click_on 'Previous Sessions' - expect(page).to have_content(recording.download_file_name) - expect(page).to have_content('Hide') - - accept_alert do - click_link "Hide" - end - - expect(page).not_to have_content(recording.download_file_name) - expect(page).to have_content("Recording of the live stream will appear here") - end - context 'When the user is associate' do let(:current_user) { create(:user, :associate) } @@ -240,17 +221,6 @@ feature 'User managing broadcasts' do expect(page).to have_content delete_file_button, count: 0 end - - scenario 'associate does not see hide button in front of recording' do - broadcast = create(:broadcast, :with_stream, :with_files, project: project) - recording = create(:broadcast_recording, broadcast: broadcast, asset_uid: "another_asset_uid") - - visit project_broadcast_path(project, broadcast) - - click_on 'Previous Sessions' - expect(page).to have_content(recording.download_file_name) - expect(page).not_to have_content('Hide') - end end context 'When the user is account manager' do @@ -277,24 +247,6 @@ feature 'User managing broadcasts' do expect(page).to have_content delete_file_button, count: 2 expect(Broadcast.find(broadcast.id).files.count).to eq 2 end - - scenario 'account manager can hide broadcast recordings', js: true do - broadcast = create(:broadcast, :with_stream, :with_files, project: project) - recording = create(:broadcast_recording, broadcast: broadcast, asset_uid: "another_asset_uid") - - visit project_broadcast_path(project, broadcast) - - click_on 'Previous Sessions' - expect(page).to have_content(recording.download_file_name) - expect(page).to have_content('Hide') - - accept_alert do - click_link "Hide" - end - - expect(page).not_to have_content(recording.download_file_name) - expect(page).to have_content("Recording of the live stream will appear here") - end end end diff --git a/spec/features/user_managing_location_releases_spec.rb b/spec/features/user_managing_location_releases_spec.rb index 4b3da39..db3e53a 100644 --- a/spec/features/user_managing_location_releases_spec.rb +++ b/spec/features/user_managing_location_releases_spec.rb @@ -87,7 +87,7 @@ feature "User managing location releases" do visit new_account_project_contract_template_location_release_amendment_path(project.account, project, contract_template, release) - expect(page).to have_content amendments_heading.upcase + expect(page).to have_content amendments_heading fill_in amendment_signer_name_field, with: 'Big Signer' draw_signature file_fixture("signature.png"), amendment_signature_field @@ -127,14 +127,6 @@ feature "User managing location releases" do sign_in current_user end - scenario "listing all releases, table have correct headers", js:true do - ct = create(:contract_template, :with_amendment_clause, project: project) - create(:location_release, :native, project: project, contract_template: ct) - visit project_location_releases_path(project) - - table_headers.each { |s| expect(page).to have_content s } - end - scenario "creating a release", js: true do visit new_project_location_release_path(project) @@ -250,7 +242,7 @@ feature "User managing location releases" do new_window = window_opened_by { click_link sign_amendment_link } within_window new_window do - expect(page).to have_content amendments_heading.upcase + expect(page).to have_content amendments_heading fill_in amendment_signer_name_field, with: 'Big Signer' draw_signature file_fixture("signature.png"), amendment_signature_field @@ -690,10 +682,6 @@ feature "User managing location releases" do t 'public.amendments.new.amendment.heading' end - def signed_contract_preview - t 'public.amendments.new.signed_contract_preview' - end - def amendment_signer_name_field 'location_release[amendment_signer_name]' end @@ -741,16 +729,4 @@ feature "User managing location releases" do def amendment_signature_label t 'contracts.amendment_page.description_labels.amendment_signature' end - - def table_headers - [ - t('location_releases.index.table_headers.approved'), - t('location_releases.index.table_headers.location_info'), - t('location_releases.index.table_headers.owner_info'), - t('location_releases.index.table_headers.notes'), - t('location_releases.index.table_headers.tags'), - t('location_releases.index.table_headers.signed_at'), - t('location_releases.index.table_headers.amendment_signed') - ] - end end diff --git a/spec/features/user_managing_material_releases_spec.rb b/spec/features/user_managing_material_releases_spec.rb index 594d20a..ae69e09 100644 --- a/spec/features/user_managing_material_releases_spec.rb +++ b/spec/features/user_managing_material_releases_spec.rb @@ -40,93 +40,6 @@ feature "User managing material releases" do expect(MaterialRelease.last.photos.attached?).to eq true end - scenario "creating a release for a minor - guardian fields are required when minor checkbox is checked", js: true do - contract_template = create(:contract_template, project: project) - - visit new_account_project_contract_template_material_release_path(project.account, project, contract_template) - - all('input[data-required-tag="guardian"]').each do |field| - expect(field['required']).to eq 'false' - expect(field).not_to be_visible - end - - page.check person_is_minor_checkbox - - all('input[data-required-tag="guardian"]').each do |field| - expect(field['required']).to eq 'true' - expect(field).to be_visible - end - end - - scenario 'creating a release for a minor', js: true do - project = create(:project, members: current_user, account: current_user.primary_account) - contract_template = create(:contract_template, project: project) - - visit new_account_project_contract_template_material_release_path(project.account, project, contract_template) - - expect(page).not_to have_content guardian_information_heading.upcase - expect(page).not_to have_content guardian_photo_heading.upcase - - page.check person_is_minor_checkbox - - expect(page).to have_content guardian_information_heading.upcase - expect(page).to have_content guardian_photo_heading.upcase - expect(page).to have_content guardian_email_field.titleize - - fill_all_fields - - fill_in guardian_first_name_field, with: 'Guardian' - fill_in guardian_last_name_field, with: 'Name' - fill_in guardian_phone_field, with: '001101' - fill_in guardian_email_field, with: 'valid@email.com' - attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all - fill_in_guardian_address_fields - - draw_signature file_fixture("signature.png"), signature_field - - click_button submit_release_button - - expect(page).to have_content(successful_submission_message) - end - - scenario 'creating a release for a minor with two guardians', js: true do - project = create(:project, members: current_user, account: current_user.primary_account) - contract_template = create(:contract_template, project: project) - - visit new_account_project_contract_template_material_release_path(project.account, project, contract_template) - - expect(page).not_to have_content guardian_2_information_heading.upcase - expect(page).not_to have_content guardian_2_photo_heading.upcase - - page.check person_is_minor_checkbox - expect(page).to have_content guardian_information_heading.upcase - expect(page).to have_content guardian_photo_heading.upcase - expect(page).to have_content guardian_email_field.titleize - - expect(page).to have_content guardian_2_information_heading.upcase - expect(page).to have_content guardian_2_photo_heading.upcase - expect(page).to have_content guardian_2_phone_field.titleize - - fill_all_fields - - fill_in guardian_first_name_field, with: 'Guardian' - fill_in guardian_last_name_field, with: 'Name' - fill_in guardian_phone_field, with: '001101' - fill_in guardian_email_field, with: 'valid@email.com' - attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all - fill_in_guardian_address_fields - draw_signature file_fixture("signature.png"), signature_field - - fill_in guardian_2_first_name_field, with: 'Second' - fill_in guardian_2_last_name_field, with: 'Guardian' - fill_in guardian_2_phone_field, with: '999' - - click_button submit_release_button - - expect(page).to have_content(successful_submission_message) - expect(MaterialRelease.last.guardian_2_first_name).to eq 'Second' - end - scenario "creating release is possible only after filling all fields", js: true do contract_template = create(:contract_template, project: project) @@ -185,25 +98,7 @@ feature "User managing material releases" do sign_in current_user end - scenario "index table shows owner info" do - release = create(:material_release, :native, :with_address, project: project) - - visit project_material_releases_path(project) - - expect(page).to have_content owner_info_table_header - - expect(page).to have_content release.person_first_name - expect(page).to have_content release.person_last_name - expect(page).to have_content release.person_phone - expect(page).to have_content release.person_email - expect(page).to have_content release.person_address_street1 - expect(page).to have_content release.person_address_city - expect(page).to have_content release.person_address_state - expect(page).to have_content release.person_address_zip - expect(page).to have_content release.person_address_country - end - - scenario "creating a release for and adult", js: true do + scenario "creating a release", js: true do visit new_project_material_release_path(project) by "attaching only a contract" do @@ -225,94 +120,13 @@ feature "User managing material releases" do click_button create_release_button expect(page).to have_content(create_release_notice) - expect(page).to have_photo("material_photo.png", visible: :all) + expect(page).to have_photo("material_photo.png") click_on "Manage" expect(page).to have_link("Download") end end - scenario "creating a release for a minor - guardian fields are required when minor checkbox is checked", js: true do - visit new_project_material_release_path(project) - - all('input[data-required-tag="guardian"]').each do |field| - expect(field['required']).to eq 'false' - expect(field).not_to be_visible - end - - page.check person_is_minor_checkbox - - all('input[data-required-tag="guardian"]').each do |field| - expect(field['required']).to eq 'true' - expect(field).to be_visible - end - end - - scenario "creating a release for a minor", js: true do - visit new_project_material_release_path(project) - - expect(page).not_to have_content guardian_information_heading.upcase - expect(page).not_to have_content guardian_photo_heading - - page.check person_is_minor_checkbox - - expect(page).to have_content guardian_information_heading.upcase - expect(page).to have_content guardian_photo_heading - expect(page).to have_content guardian_email_field.titleize - - fill_in_release_fields name: "Apple Laptop" - attach_file contract_field, Rails.root.join(file_fixture("contract.pdf")), visible: false - - fill_in guardian_first_name_field, with: 'Guardian' - fill_in guardian_last_name_field, with: 'Name' - fill_in guardian_phone_field, with: '001101' - fill_in guardian_email_field, with: 'valid@email.com' - attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all - fill_in_guardian_address_fields - - click_button import_release_button - - expect(page).to have_content successful_import_message - expect(MaterialRelease.last.guardian_first_name).to eq 'Guardian' - end - - scenario "creating a release for a minor with two guardians", js: true do - visit new_project_material_release_path(project) - - expect(page).not_to have_content guardian_2_information_heading.upcase - expect(page).not_to have_content guardian_2_photo_heading - - page.check person_is_minor_checkbox - - expect(page).to have_content guardian_information_heading.upcase - expect(page).to have_content guardian_photo_heading - expect(page).to have_content guardian_email_field.titleize - - expect(page).to have_content guardian_2_information_heading.upcase - expect(page).to have_content guardian_2_photo_heading - expect(page).to have_content guardian_2_phone_field.titleize - - fill_in_release_fields name: "Apple Laptop" - attach_file contract_field, Rails.root.join(file_fixture("contract.pdf")), visible: false - - fill_in guardian_first_name_field, with: 'Guardian' - fill_in guardian_last_name_field, with: 'Name' - fill_in guardian_phone_field, with: '001101' - fill_in guardian_email_field, with: 'valid@email.com' - attach_file guardian_photo_field, file_fixture('hemsworth.jpeg'), visible: :all - fill_in_guardian_address_fields - - fill_in guardian_2_first_name_field, with: 'Second' - fill_in guardian_2_last_name_field, with: 'Guardian' - fill_in guardian_2_phone_field, with: '999' - - click_button import_release_button - - expect(page).to have_content successful_import_message - expect(MaterialRelease.last.guardian_first_name).to eq 'Guardian' - expect(MaterialRelease.last.guardian_2_first_name).to eq 'Second' - end - scenario "updating an existing release", js: true do material_release = create(:material_release, :non_native, project: project) @@ -376,7 +190,7 @@ feature "User managing material releases" do click_on "Save Changes" expect(page).to have_content("The release has been updated") - expect(page).to have_photo("material_photo.png", visible: :all) + expect(page).to have_photo("material_photo.png") end scenario "viewing the contract PDF" do @@ -605,8 +419,8 @@ feature "User managing material releases" do "material_release[person_address_zip]" end - def have_photo(filename, visible: true) - have_selector("img[src*='#{filename}']", visible: visible) + def have_photo(filename) + have_selector("img[src*='#{filename}']") end def import_material_release_link(project) @@ -728,111 +542,4 @@ feature "User managing material releases" do def date_issued t 'contracts.for_office_use_only.description_labels.date_issued' end - - def person_is_minor_checkbox - 'material_release_minor' - end - - def guardian_2_first_name_field - t 'helpers.label.material_release.guardian_2_first_name' - end - - def guardian_2_last_name_field - t 'helpers.label.material_release.guardian_2_last_name' - end - - def guardian_2_phone_field - t 'helpers.label.material_release.guardian_2_phone' - end - - def guardian_first_name_field - t 'helpers.label.material_release.guardian_first_name' - end - - def guardian_last_name_field - t 'helpers.label.material_release.guardian_last_name' - end - - def guardian_phone_field - t 'helpers.label.material_release.guardian_phone' - end - - def guardian_email_field - t 'helpers.label.material_release.guardian_email' - end - - def guardian_address_street1_field - t('helpers.label.material_release.guardian_address_street1') - end - - def guardian_address_city_field - t('helpers.label.material_release.guardian_address_city') - end - - def guardian_address_state_field - t('helpers.label.material_release.guardian_address_state') - end - - def guardian_address_zip_field - t('helpers.label.material_release.guardian_address_zip') - end - - def guardian_photo_field - 'material_release[guardian_photo]' - end - - def guardian_2_photo_field - 'material_release[guardian_2_photo]' - end - - def fill_in_guardian_address_fields - fill_in guardian_address_street1_field, with: "124 Test Lane" - fill_in guardian_address_city_field, with: "New York" - fill_in guardian_address_state_field, with: "NY" - fill_in guardian_address_zip_field, with: '1000' - end - - def submit_release_button - 'I have read and agree to the above' - end - - def successful_submission_message - 'Your release was successfully submitted. Thank you.' - end - - def guardian_information_heading - t 'public.material_releases.new.guardian_info.heading' - end - - def guardian_photo_heading - t 'public.material_releases.new.guardian_photo.heading' - end - - def guardian_2_information_heading - t 'public.material_releases.new.guardian_2_info.heading' - end - - def guardian_2_photo_heading - t 'public.material_releases.new.guardian_2_photo.heading' - end - - def contract_field - 'material_release[contract]' - end - - def import_release_button - t 'helpers.submit.material_release.create' - end - - def successful_import_message - t 'material_releases.create.notice' - end - - def signature_field - 'material_release_signature_base64' - end - - def owner_info_table_header - t 'material_releases.index.table_headers.owner_info' - end end diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb index 09e50ec..97468b7 100644 --- a/spec/models/account_spec.rb +++ b/spec/models/account_spec.rb @@ -148,18 +148,6 @@ RSpec.describe Account do end end - describe "#total_number_of_releases" do - it "returns total number of releases" do - account = create(:account) - project = create(:project, account: account) - appearance_release = create(:appearance_release, project: project) - talent_release = create(:talent_release, project: project) - material_release = create(:material_release, project: project) - - expect(account.total_number_of_releases).to eq 3 - end - end - describe "#me_suite_enabled?" do it "returns true when plan_uid is me_suite" do expect(build(:account, plan_uid: "me_suite").me_suite_enabled?).to eq true diff --git a/spec/models/broadcast_spec.rb b/spec/models/broadcast_spec.rb index 8813e47..81abfbc 100644 --- a/spec/models/broadcast_spec.rb +++ b/spec/models/broadcast_spec.rb @@ -49,36 +49,6 @@ RSpec.describe Broadcast, type: :model do expect(broadcast).to have_received(:destroy_mux_live_stream) end end - - context "#stream_server_url" do - it "returns mux stream url when overriden stream url is absent" do - ENV["MUX_BROADCAST_SERVER_URL"] = "mux_stream" - broadcast = create(:broadcast, :with_stream, skip_create_callback: true, name: "My Broadcast") - - expect(broadcast.stream_server_url).to eq("mux_stream") - end - - it "returns overriden stream url when it is present" do - ENV["MUX_BROADCAST_SERVER_URL"] = "mux_stream" - broadcast = create(:broadcast, :with_overriden_stream, skip_create_callback: true, name: "My Broadcast") - - expect(broadcast.stream_server_url).to eq("overriden_stream_url") - end - end - - context "#stream_server_key" do - it "returns mux stream key when overriden stream key is absent" do - broadcast = create(:broadcast, :with_stream, skip_create_callback: true, name: "My Broadcast") - - expect(broadcast.stream_server_key).to eq("mux_key") - end - - it "returns overriden stream key when it is present" do - broadcast = create(:broadcast, :with_overriden_stream, skip_create_callback: true, name: "My Broadcast") - - expect(broadcast.stream_server_key).to eq("overriden_stream_key") - end - end end describe "#zoom_meeting_url" do