diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /spec/frontend/fixtures | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'spec/frontend/fixtures')
31 files changed, 49 insertions, 33 deletions
diff --git a/spec/frontend/fixtures/abuse_reports.rb b/spec/frontend/fixtures/abuse_reports.rb index 712ed2e8d7e..48b055fcda5 100644 --- a/spec/frontend/fixtures/abuse_reports.rb +++ b/spec/frontend/fixtures/abuse_reports.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Admin::AbuseReportsController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Admin::AbuseReportsController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let(:admin) { create(:admin) } diff --git a/spec/frontend/fixtures/admin_users.rb b/spec/frontend/fixtures/admin_users.rb index b0f7d69f091..f068ada53e1 100644 --- a/spec/frontend/fixtures/admin_users.rb +++ b/spec/frontend/fixtures/admin_users.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Admin::UsersController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Admin::UsersController, '(JavaScript fixtures)', type: :controller do include StubENV include JavaScriptFixturesHelpers diff --git a/spec/frontend/fixtures/application_settings.rb b/spec/frontend/fixtures/application_settings.rb index a16888d8f03..6156e6a43bc 100644 --- a/spec/frontend/fixtures/application_settings.rb +++ b/spec/frontend/fixtures/application_settings.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Admin::ApplicationSettingsController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Admin::ApplicationSettingsController, '(JavaScript fixtures)', type: :controller do include StubENV include JavaScriptFixturesHelpers diff --git a/spec/frontend/fixtures/autocomplete_sources.rb b/spec/frontend/fixtures/autocomplete_sources.rb index 812364c8b06..8858d69a939 100644 --- a/spec/frontend/fixtures/autocomplete_sources.rb +++ b/spec/frontend/fixtures/autocomplete_sources.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::AutocompleteSourcesController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Projects::AutocompleteSourcesController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let_it_be(:admin) { create(:admin) } diff --git a/spec/frontend/fixtures/blob.rb b/spec/frontend/fixtures/blob.rb index 28a3badaa17..712c3bd9b23 100644 --- a/spec/frontend/fixtures/blob.rb +++ b/spec/frontend/fixtures/blob.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::BlobController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Projects::BlobController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let(:admin) { create(:admin) } diff --git a/spec/frontend/fixtures/boards.rb b/spec/frontend/fixtures/boards.rb index b3c7865a088..90e2ca4db63 100644 --- a/spec/frontend/fixtures/boards.rb +++ b/spec/frontend/fixtures/boards.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::BoardsController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Projects::BoardsController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let(:admin) { create(:admin) } diff --git a/spec/frontend/fixtures/branches.rb b/spec/frontend/fixtures/branches.rb index 2dc8cde625a..4667dfb69f8 100644 --- a/spec/frontend/fixtures/branches.rb +++ b/spec/frontend/fixtures/branches.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::BranchesController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Projects::BranchesController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let(:admin) { create(:admin) } diff --git a/spec/frontend/fixtures/clusters.rb b/spec/frontend/fixtures/clusters.rb index fd64d3c0e28..d0940c7dc7f 100644 --- a/spec/frontend/fixtures/clusters.rb +++ b/spec/frontend/fixtures/clusters.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::ClustersController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Projects::ClustersController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let(:admin) { create(:admin) } diff --git a/spec/frontend/fixtures/commit.rb b/spec/frontend/fixtures/commit.rb index c9a5aa9a67c..c5c00afd4ca 100644 --- a/spec/frontend/fixtures/commit.rb +++ b/spec/frontend/fixtures/commit.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::CommitController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Projects::CommitController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let_it_be(:project) { create(:project, :repository) } diff --git a/spec/frontend/fixtures/deploy_keys.rb b/spec/frontend/fixtures/deploy_keys.rb index f491c424bcf..e87600e9d24 100644 --- a/spec/frontend/fixtures/deploy_keys.rb +++ b/spec/frontend/fixtures/deploy_keys.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::DeployKeysController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Projects::DeployKeysController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let(:admin) { create(:admin) } diff --git a/spec/frontend/fixtures/groups.rb b/spec/frontend/fixtures/groups.rb index 2421b67a130..6f0d7aa1f7c 100644 --- a/spec/frontend/fixtures/groups.rb +++ b/spec/frontend/fixtures/groups.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Groups (JavaScript fixtures)', type: :controller do +RSpec.describe 'Groups (JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let(:admin) { create(:admin) } diff --git a/spec/frontend/fixtures/issues.rb b/spec/frontend/fixtures/issues.rb index 9a194e5ca84..2c380ba6a96 100644 --- a/spec/frontend/fixtures/issues.rb +++ b/spec/frontend/fixtures/issues.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::IssuesController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Projects::IssuesController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let(:admin) { create(:admin, feed_token: 'feedtoken:coldfeed') } @@ -75,7 +75,7 @@ describe Projects::IssuesController, '(JavaScript fixtures)', type: :controller end end -describe API::Issues, '(JavaScript fixtures)', type: :request do +RSpec.describe API::Issues, '(JavaScript fixtures)', type: :request do include ApiHelpers include JavaScriptFixturesHelpers diff --git a/spec/frontend/fixtures/jobs.rb b/spec/frontend/fixtures/jobs.rb index 787ab517f75..64197a62301 100644 --- a/spec/frontend/fixtures/jobs.rb +++ b/spec/frontend/fixtures/jobs.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::JobsController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Projects::JobsController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let(:admin) { create(:admin) } diff --git a/spec/frontend/fixtures/labels.rb b/spec/frontend/fixtures/labels.rb index e5a0501ac03..2b7babb2e52 100644 --- a/spec/frontend/fixtures/labels.rb +++ b/spec/frontend/fixtures/labels.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Labels (JavaScript fixtures)' do +RSpec.describe 'Labels (JavaScript fixtures)' do include JavaScriptFixturesHelpers let(:admin) { create(:admin) } diff --git a/spec/frontend/fixtures/merge_requests.rb b/spec/frontend/fixtures/merge_requests.rb index a347ef683e7..7801eb27ce8 100644 --- a/spec/frontend/fixtures/merge_requests.rb +++ b/spec/frontend/fixtures/merge_requests.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let(:admin) { create(:admin) } diff --git a/spec/frontend/fixtures/merge_requests_diffs.rb b/spec/frontend/fixtures/merge_requests_diffs.rb index 76bb8567a64..63bd02d0fbd 100644 --- a/spec/frontend/fixtures/merge_requests_diffs.rb +++ b/spec/frontend/fixtures/merge_requests_diffs.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::MergeRequests::DiffsController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Projects::MergeRequests::DiffsController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let(:admin) { create(:admin) } diff --git a/spec/frontend/fixtures/metrics_dashboard.rb b/spec/frontend/fixtures/metrics_dashboard.rb index f0c741af37d..b5dee7525f6 100644 --- a/spec/frontend/fixtures/metrics_dashboard.rb +++ b/spec/frontend/fixtures/metrics_dashboard.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe MetricsDashboard, '(JavaScript fixtures)', type: :controller do +RSpec.describe MetricsDashboard, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers include MetricsDashboardHelpers diff --git a/spec/frontend/fixtures/pipeline_schedules.rb b/spec/frontend/fixtures/pipeline_schedules.rb index e00a35d5362..e47bb25ec0a 100644 --- a/spec/frontend/fixtures/pipeline_schedules.rb +++ b/spec/frontend/fixtures/pipeline_schedules.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::PipelineSchedulesController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Projects::PipelineSchedulesController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let(:admin) { create(:admin) } diff --git a/spec/frontend/fixtures/pipelines.rb b/spec/frontend/fixtures/pipelines.rb index 83fc13af7d3..93e2c19fc27 100644 --- a/spec/frontend/fixtures/pipelines.rb +++ b/spec/frontend/fixtures/pipelines.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::PipelinesController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Projects::PipelinesController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let(:admin) { create(:admin) } diff --git a/spec/frontend/fixtures/projects.rb b/spec/frontend/fixtures/projects.rb index ff21dbaebe8..d33909fb98b 100644 --- a/spec/frontend/fixtures/projects.rb +++ b/spec/frontend/fixtures/projects.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Projects (JavaScript fixtures)', type: :controller do +RSpec.describe 'Projects (JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers runners_token = 'runnerstoken:intabulasreferre' diff --git a/spec/frontend/fixtures/prometheus_service.rb b/spec/frontend/fixtures/prometheus_service.rb index c404b8260d2..8c923d91d08 100644 --- a/spec/frontend/fixtures/prometheus_service.rb +++ b/spec/frontend/fixtures/prometheus_service.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::ServicesController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Projects::ServicesController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let(:admin) { create(:admin) } diff --git a/spec/frontend/fixtures/raw.rb b/spec/frontend/fixtures/raw.rb index 9c9fa4ec40b..337067121d0 100644 --- a/spec/frontend/fixtures/raw.rb +++ b/spec/frontend/fixtures/raw.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Raw files', '(JavaScript fixtures)' do +RSpec.describe 'Raw files', '(JavaScript fixtures)' do include JavaScriptFixturesHelpers let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} diff --git a/spec/frontend/fixtures/search.rb b/spec/frontend/fixtures/search.rb index cbe3e373986..fcd68662acc 100644 --- a/spec/frontend/fixtures/search.rb +++ b/spec/frontend/fixtures/search.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe SearchController, '(JavaScript fixtures)', type: :controller do +RSpec.describe SearchController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers render_views diff --git a/spec/frontend/fixtures/services.rb b/spec/frontend/fixtures/services.rb index 1b81a83ca49..0877998cc9d 100644 --- a/spec/frontend/fixtures/services.rb +++ b/spec/frontend/fixtures/services.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::ServicesController, '(JavaScript fixtures)', type: :controller do +RSpec.describe Projects::ServicesController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let(:admin) { create(:admin) } diff --git a/spec/frontend/fixtures/sessions.rb b/spec/frontend/fixtures/sessions.rb index a4dc0aef79c..0ef14c1d4fa 100644 --- a/spec/frontend/fixtures/sessions.rb +++ b/spec/frontend/fixtures/sessions.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Sessions (JavaScript fixtures)' do +RSpec.describe 'Sessions (JavaScript fixtures)' do include JavaScriptFixturesHelpers before(:all) do diff --git a/spec/frontend/fixtures/snippet.rb b/spec/frontend/fixtures/snippet.rb index d27c2fbe68b..26b088bbd88 100644 --- a/spec/frontend/fixtures/snippet.rb +++ b/spec/frontend/fixtures/snippet.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe SnippetsController, '(JavaScript fixtures)', type: :controller do +RSpec.describe SnippetsController, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers let(:admin) { create(:admin) } diff --git a/spec/frontend/fixtures/static/search_autocomplete.html b/spec/frontend/fixtures/static/global_search_input.html index 29db9020424..29db9020424 100644 --- a/spec/frontend/fixtures/static/search_autocomplete.html +++ b/spec/frontend/fixtures/static/global_search_input.html diff --git a/spec/frontend/fixtures/static/oauth_remember_me.html b/spec/frontend/fixtures/static/oauth_remember_me.html index 9ba1ffc72fe..c6af8129b4d 100644 --- a/spec/frontend/fixtures/static/oauth_remember_me.html +++ b/spec/frontend/fixtures/static/oauth_remember_me.html @@ -1,6 +1,22 @@ <div id="oauth-container"> <input id="remember_me" type="checkbox"> -<a class="oauth-login twitter" href="http://example.com/"></a> -<a class="oauth-login github" href="http://example.com/"></a> -<a class="oauth-login facebook" href="http://example.com/?redirect_fragment=L1"></a> + +<form method="post" action="http://example.com/"> + <button class="oauth-login twitter" type="submit"> + <span>Twitter</span> + </button> +</form> + +<form method="post" action="http://example.com/"> + <button class="oauth-login github" type="submit"> + <span>GitHub</span> + </button> +</form> + +<form method="post" action="http://example.com/?redirect_fragment=L1"> + <button class="oauth-login facebook" type="submit"> + <span>Facebook</span> + </button> +</form> + </div> diff --git a/spec/frontend/fixtures/test_report.rb b/spec/frontend/fixtures/test_report.rb index d0ecaf11994..16496aa901b 100644 --- a/spec/frontend/fixtures/test_report.rb +++ b/spec/frontend/fixtures/test_report.rb @@ -2,7 +2,7 @@ require "spec_helper" -describe Projects::PipelinesController, "(JavaScript fixtures)", type: :controller do +RSpec.describe Projects::PipelinesController, "(JavaScript fixtures)", type: :controller do include JavaScriptFixturesHelpers let(:namespace) { create(:namespace, name: "frontend-fixtures") } diff --git a/spec/frontend/fixtures/todos.rb b/spec/frontend/fixtures/todos.rb index e5bdb4998ed..399be272e9b 100644 --- a/spec/frontend/fixtures/todos.rb +++ b/spec/frontend/fixtures/todos.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Todos (JavaScript fixtures)' do +RSpec.describe 'Todos (JavaScript fixtures)' do include JavaScriptFixturesHelpers let(:admin) { create(:admin) } diff --git a/spec/frontend/fixtures/u2f.rb b/spec/frontend/fixtures/u2f.rb index 9710fbbc181..be3874d7c42 100644 --- a/spec/frontend/fixtures/u2f.rb +++ b/spec/frontend/fixtures/u2f.rb @@ -2,7 +2,7 @@ require 'spec_helper' -context 'U2F' do +RSpec.context 'U2F' do include JavaScriptFixturesHelpers let(:user) { create(:user, :two_factor_via_u2f, otp_secret: 'otpsecret:coolkids') } |