From 1f5ca81aa6e674089c9652484e5f3bb89f86703c Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 24 May 2021 12:10:31 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .../integrations/user_activates_flowdock_spec.rb   | 22 ++++++++++++++++++++++
 .../user_activates_pivotaltracker_spec.rb          | 20 ++++++++++++++++++++
 .../services/user_activates_flowdock_spec.rb       | 22 ----------------------
 .../services/user_activates_pivotaltracker_spec.rb | 20 --------------------
 4 files changed, 42 insertions(+), 42 deletions(-)
 create mode 100644 spec/features/projects/integrations/user_activates_flowdock_spec.rb
 create mode 100644 spec/features/projects/integrations/user_activates_pivotaltracker_spec.rb
 delete mode 100644 spec/features/projects/services/user_activates_flowdock_spec.rb
 delete mode 100644 spec/features/projects/services/user_activates_pivotaltracker_spec.rb

(limited to 'spec/features')

diff --git a/spec/features/projects/integrations/user_activates_flowdock_spec.rb b/spec/features/projects/integrations/user_activates_flowdock_spec.rb
new file mode 100644
index 00000000000..4a4d7bbecfd
--- /dev/null
+++ b/spec/features/projects/integrations/user_activates_flowdock_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'User activates Flowdock' do
+  include_context 'project service activation' do
+    let(:project) { create(:project, :repository) }
+  end
+
+  before do
+    stub_request(:post, /.*api.flowdock.com.*/)
+  end
+
+  it 'activates service', :js do
+    visit_project_integration('Flowdock')
+    fill_in('Token', with: 'verySecret')
+
+    click_test_then_save_integration(expect_test_to_fail: false)
+
+    expect(page).to have_content('Flowdock settings saved and active.')
+  end
+end
diff --git a/spec/features/projects/integrations/user_activates_pivotaltracker_spec.rb b/spec/features/projects/integrations/user_activates_pivotaltracker_spec.rb
new file mode 100644
index 00000000000..83f66d4fa7b
--- /dev/null
+++ b/spec/features/projects/integrations/user_activates_pivotaltracker_spec.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'User activates PivotalTracker' do
+  include_context 'project service activation'
+
+  before do
+    stub_request(:post, /.*www.pivotaltracker.com.*/)
+  end
+
+  it 'activates service', :js do
+    visit_project_integration('PivotalTracker')
+    fill_in('Token', with: 'verySecret')
+
+    click_test_then_save_integration(expect_test_to_fail: false)
+
+    expect(page).to have_content('PivotalTracker settings saved and active.')
+  end
+end
diff --git a/spec/features/projects/services/user_activates_flowdock_spec.rb b/spec/features/projects/services/user_activates_flowdock_spec.rb
deleted file mode 100644
index 4a4d7bbecfd..00000000000
--- a/spec/features/projects/services/user_activates_flowdock_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe 'User activates Flowdock' do
-  include_context 'project service activation' do
-    let(:project) { create(:project, :repository) }
-  end
-
-  before do
-    stub_request(:post, /.*api.flowdock.com.*/)
-  end
-
-  it 'activates service', :js do
-    visit_project_integration('Flowdock')
-    fill_in('Token', with: 'verySecret')
-
-    click_test_then_save_integration(expect_test_to_fail: false)
-
-    expect(page).to have_content('Flowdock settings saved and active.')
-  end
-end
diff --git a/spec/features/projects/services/user_activates_pivotaltracker_spec.rb b/spec/features/projects/services/user_activates_pivotaltracker_spec.rb
deleted file mode 100644
index 83f66d4fa7b..00000000000
--- a/spec/features/projects/services/user_activates_pivotaltracker_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe 'User activates PivotalTracker' do
-  include_context 'project service activation'
-
-  before do
-    stub_request(:post, /.*www.pivotaltracker.com.*/)
-  end
-
-  it 'activates service', :js do
-    visit_project_integration('PivotalTracker')
-    fill_in('Token', with: 'verySecret')
-
-    click_test_then_save_integration(expect_test_to_fail: false)
-
-    expect(page).to have_content('PivotalTracker settings saved and active.')
-  end
-end
-- 
cgit v1.2.1