Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 1 deletions

diff --git a/spec/helpers/application_settings_helper_spec.rb b/spec/helpers/application_settings_helper_spec.rb
index a5e8370a715..8303c4eafbe 100644
--- a/spec/helpers/application_settings_helper_spec.rb
+++ b/spec/helpers/application_settings_helper_spec.rb
@@ -39,7 +39,6 @@ describe ApplicationSettingsHelper do
 
   context 'with tracking parameters' do
     it { expect(visible_attributes).to include(*%i(snowplow_collector_hostname snowplow_cookie_domain snowplow_enabled snowplow_app_id)) }
-    it { expect(visible_attributes).to include(*%i(pendo_enabled pendo_url)) }
   end
 
   describe '.integration_expanded?' do
diff --git a/spec/helpers/releases_helper_spec.rb b/spec/helpers/releases_helper_spec.rb
index 3b4973677ef..3f56c189642 100644
--- a/spec/helpers/releases_helper_spec.rb
+++ b/spec/helpers/releases_helper_spec.rb
@@ -17,9 +17,11 @@ describe ReleasesHelper do
 
   context 'url helpers' do
     let(:project) { build(:project, namespace: create(:group)) }
+    let(:release) { create(:release, project: project) }
 
     before do
       helper.instance_variable_set(:@project, project)
+      helper.instance_variable_set(:@release, release)
     end
 
     describe '#data_for_releases_page' do
@@ -28,5 +30,17 @@ describe ReleasesHelper do
         expect(helper.data_for_releases_page.keys).to eq(keys)
       end
     end
+
+    describe '#data_for_edit_release_page' do
+      it 'has the needed data to display the "edit release" page' do
+        keys = %i(project_id
+                  tag_name
+                  markdown_preview_path
+                  markdown_docs_path
+                  releases_page_path
+                  update_release_api_docs_path)
+        expect(helper.data_for_edit_release_page.keys).to eq(keys)
+      end
+    end
   end
 end