Automatic merge of gitlab-org/gitlab-ce master

spec/models/ability_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ability do

spec/models/abuse_report_spec.rb

+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe AbuseReport do

spec/models/active_session_spec.rb

+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe ActiveSession, :clean_gitlab_redis_shared_state do

spec/models/appearance_spec.rb

+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe Appearance do

spec/models/application_setting/term_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ApplicationSetting::Term do

spec/models/application_setting_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ApplicationSetting do

spec/models/award_emoji_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe AwardEmoji do

spec/models/badge_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Badge do

spec/models/badges/group_badge_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe GroupBadge do

spec/models/badges/project_badge_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ProjectBadge do

spec/models/blob_spec.rb

 # encoding: utf-8
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe Blob do

spec/models/blob_viewer/base_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BlobViewer::Base do

spec/models/blob_viewer/changelog_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BlobViewer::Changelog do

spec/models/blob_viewer/composer_json_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BlobViewer::ComposerJson do

spec/models/blob_viewer/gemspec_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BlobViewer::Gemspec do

spec/models/blob_viewer/gitlab_ci_yml_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BlobViewer::GitlabCiYml do

spec/models/blob_viewer/license_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BlobViewer::License do

spec/models/blob_viewer/package_json_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BlobViewer::PackageJson do

spec/models/blob_viewer/podspec_json_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BlobViewer::PodspecJson do

spec/models/blob_viewer/podspec_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BlobViewer::Podspec do

spec/models/blob_viewer/readme_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BlobViewer::Readme do

spec/models/blob_viewer/route_map_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BlobViewer::RouteMap do

spec/models/blob_viewer/server_side_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BlobViewer::ServerSide do

spec/models/board_spec.rb

+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe Board do

spec/models/broadcast_message_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BroadcastMessage do

spec/models/chat_name_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ChatName do

spec/models/chat_team_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ChatTeam do

spec/models/ci/artifact_blob_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::ArtifactBlob do

spec/models/ci/bridge_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::Bridge do

spec/models/ci/build_metadata_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::BuildMetadata do

spec/models/ci/build_runner_session_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::BuildRunnerSession, model: true do

spec/models/ci/build_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::Build do

spec/models/ci/build_trace_chunks/database_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::BuildTraceChunks::Database do

spec/models/ci/build_trace_chunks/fog_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::BuildTraceChunks::Fog do

spec/models/ci/build_trace_chunks/redis_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::BuildTraceChunks::Redis, :clean_gitlab_redis_shared_state do

spec/models/ci/build_trace_section_name_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::BuildTraceSectionName, model: true do

spec/models/ci/build_trace_section_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::BuildTraceSection, model: true do

spec/models/ci/group_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::Group do

spec/models/ci/group_variable_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::GroupVariable do

spec/models/ci/job_artifact_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::JobArtifact do

spec/models/ci/legacy_stage_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::LegacyStage do

spec/models/ci/pipeline_schedule_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::PipelineSchedule do

spec/models/ci/pipeline_schedule_variable_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::PipelineScheduleVariable do

spec/models/ci/pipeline_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::Pipeline, :mailer do

spec/models/ci/pipeline_variable_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::PipelineVariable do

spec/models/ci/runner_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::Runner do

spec/models/ci/stage_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::Stage, :models do

spec/models/ci/trigger_request_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::TriggerRequest do

spec/models/ci/trigger_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::Trigger do

spec/models/ci/variable_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ci::Variable do

spec/models/clusters/applications/cert_manager_spec.rb

+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe Clusters::Applications::CertManager do
@@ -9,7 +11,27 @@ describe Clusters::Applications::CertManager do
   include_examples 'cluster application initial status specs'
 
   describe '#install_command' do
-    let(:cluster_issuer_file) { { "cluster_issuer.yaml": "---\napiVersion: certmanager.k8s.io/v1alpha1\nkind: ClusterIssuer\nmetadata:\n  name: letsencrypt-prod\nspec:\n  acme:\n    server: https://acme-v02.api.letsencrypt.org/directory\n    email: admin@example.com\n    privateKeySecretRef:\n      name: letsencrypt-prod\n    http01: {}\n" } }
+    let(:cert_email) { 'admin@example.com' }
+
+    let(:cluster_issuer_file) do
+      file_contents = <<~EOF
+      ---
+      apiVersion: certmanager.k8s.io/v1alpha1
+      kind: ClusterIssuer
+      metadata:
+        name: letsencrypt-prod
+      spec:
+        acme:
+          server: https://acme-v02.api.letsencrypt.org/directory
+          email: #{cert_email}
+          privateKeySecretRef:
+            name: letsencrypt-prod
+          http01: {}
+      EOF
+
+      { "cluster_issuer.yaml": file_contents }
+    end
+
     subject { cert_manager.install_command }
 
     it { is_expected.to be_an_instance_of(Gitlab::Kubernetes::Helm::InstallCommand) }
@@ -24,9 +46,10 @@ describe Clusters::Applications::CertManager do
     end
 
     context 'for a specific user' do
+      let(:cert_email) { 'abc@xyz.com' }
+
       before do
-        cert_manager.email = 'abc@xyz.com'
-        cluster_issuer_file[:'cluster_issuer.yaml'].gsub! 'admin@example.com', 'abc@xyz.com'
+        cert_manager.email = cert_email
       end
 
       it 'should use his/her email to register issuer with certificate provider' do

spec/models/clusters/applications/helm_spec.rb

+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe Clusters::Applications::Helm do

spec/models/clusters/applications/ingress_spec.rb

+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe Clusters::Applications::Ingress do

spec/models/clusters/applications/jupyter_spec.rb

+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe Clusters::Applications::Jupyter do

spec/models/clusters/applications/knative_spec.rb

+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe Clusters::Applications::Knative do

spec/models/clusters/applications/prometheus_spec.rb

+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe Clusters::Applications::Prometheus do

spec/models/clusters/applications/runner_spec.rb

+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe Clusters::Applications::Runner do

spec/models/clusters/platforms/kubernetes_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching do

spec/models/clusters/project_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Clusters::Project do

spec/models/clusters/providers/gcp_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Clusters::Providers::Gcp do

spec/models/commit_collection_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe CommitCollection do

spec/models/commit_range_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe CommitRange do

spec/models/commit_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Commit do

spec/models/commit_status_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe CommitStatus do

spec/models/compare_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Compare do

spec/models/concerns/access_requestable_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe AccessRequestable do

spec/models/concerns/avatarable_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Avatarable do

spec/models/concerns/awardable_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Awardable do

spec/models/concerns/batch_destroy_dependent_associations_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe BatchDestroyDependentAssociations do

spec/models/concerns/blocks_json_serialization_spec.rb

+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe BlocksJsonSerialization do

spec/models/concerns/cache_markdown_field_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe CacheMarkdownField do

spec/models/concerns/cacheable_attributes_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe CacheableAttributes do

spec/models/concerns/case_sensitivity_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe CaseSensitivity do

spec/models/concerns/chronic_duration_attribute_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 shared_examples 'ChronicDurationAttribute reader' do

spec/models/concerns/deployable_spec.rb

+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe Deployable do

spec/models/concerns/deployment_platform_spec.rb

+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe DeploymentPlatform do

spec/models/concerns/discussion_on_diff_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DiscussionOnDiff do

spec/models/concerns/each_batch_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe EachBatch do

spec/models/concerns/editable_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Editable do

spec/models/concerns/expirable_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Expirable do

spec/models/concerns/faster_cache_keys_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe FasterCacheKeys do

spec/models/concerns/feature_gate_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe FeatureGate do

spec/models/concerns/group_descendant_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe GroupDescendant, :nested_groups do

spec/models/concerns/has_status_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe HasStatus do

spec/models/concerns/has_variable_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe HasVariable do

spec/models/concerns/ignorable_column_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe IgnorableColumn do

spec/models/concerns/issuable_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Issuable do

spec/models/concerns/loaded_in_group_list_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe LoadedInGroupList do

spec/models/concerns/manual_inverse_association_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ManualInverseAssociation do

spec/models/concerns/mentionable_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Mentionable do

spec/models/concerns/milestoneish_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Milestone, 'Milestoneish' do

spec/models/concerns/noteable_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Noteable do

spec/models/concerns/participable_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Participable do

spec/models/concerns/presentable_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Presentable do

spec/models/concerns/project_features_compatibility_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ProjectFeaturesCompatibility do

spec/models/concerns/prometheus_adapter_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe PrometheusAdapter, :use_clean_rails_memory_store_caching do

spec/models/concerns/protected_ref_access_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ProtectedRefAccess do

spec/models/concerns/reactive_caching_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ReactiveCaching, :use_clean_rails_memory_store_caching do

spec/models/concerns/redactable_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Redactable do

spec/models/concerns/redis_cacheable_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe RedisCacheable do