diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 12:26:25 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 12:26:25 +0000 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /spec/frontend/fixtures | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) | |
download | gitlab-ce-a09983ae35713f5a2bbb100981116d31ce99826e.tar.gz |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'spec/frontend/fixtures')
-rw-r--r-- | spec/frontend/fixtures/branches.rb | 50 | ||||
-rw-r--r-- | spec/frontend/fixtures/commit.rb | 49 | ||||
-rw-r--r-- | spec/frontend/fixtures/emojis.rb | 17 | ||||
-rw-r--r-- | spec/frontend/fixtures/metrics_dashboard.rb | 12 | ||||
-rw-r--r-- | spec/frontend/fixtures/services.rb | 2 | ||||
-rw-r--r-- | spec/frontend/fixtures/static/mini_dropdown_graph.html | 24 | ||||
-rw-r--r-- | spec/frontend/fixtures/static/search_autocomplete.html (renamed from spec/frontend/fixtures/static/global_search_input.html) | 0 | ||||
-rw-r--r-- | spec/frontend/fixtures/tags.rb | 28 |
8 files changed, 135 insertions, 47 deletions
diff --git a/spec/frontend/fixtures/branches.rb b/spec/frontend/fixtures/branches.rb index 4667dfb69f8..df2d1af7ecf 100644 --- a/spec/frontend/fixtures/branches.rb +++ b/spec/frontend/fixtures/branches.rb @@ -2,33 +2,51 @@ require 'spec_helper' -RSpec.describe Projects::BranchesController, '(JavaScript fixtures)', type: :controller do +RSpec.describe 'Branches (JavaScript fixtures)' do include JavaScriptFixturesHelpers - let(:admin) { create(:admin) } - let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} - let(:project) { create(:project, :repository, namespace: namespace, path: 'branches-project') } - - render_views + let_it_be(:admin) { create(:admin) } + let_it_be(:namespace) { create(:namespace, name: 'frontend-fixtures' )} + let_it_be(:project) { create(:project, :repository, namespace: namespace, path: 'branches-project') } before(:all) do clean_frontend_fixtures('branches/') + clean_frontend_fixtures('api/branches/') end - before do - sign_in(admin) + after(:all) do + remove_repository(project) end - after do - remove_repository(project) + describe Projects::BranchesController, '(JavaScript fixtures)', type: :controller do + render_views + + before do + sign_in(admin) + end + + it 'branches/new_branch.html' do + get :new, params: { + namespace_id: project.namespace.to_param, + project_id: project + } + + expect(response).to be_successful + end end - it 'branches/new_branch.html' do - get :new, params: { - namespace_id: project.namespace.to_param, - project_id: project - } + describe API::Branches, '(JavaScript fixtures)', type: :request do + include ApiHelpers + + it 'api/branches/branches.json' do + # The search query "ma" matches a few branch names in the test + # repository with a variety of different properties, including: + # - "master": default, protected + # - "markdown": non-default, protected + # - "many_files": non-default, not protected + get api("/projects/#{project.id}/repository/branches?search=ma", admin) - expect(response).to be_successful + expect(response).to be_successful + end end end diff --git a/spec/frontend/fixtures/commit.rb b/spec/frontend/fixtures/commit.rb index c5c00afd4ca..9175a757b73 100644 --- a/spec/frontend/fixtures/commit.rb +++ b/spec/frontend/fixtures/commit.rb @@ -2,34 +2,55 @@ require 'spec_helper' -RSpec.describe Projects::CommitController, '(JavaScript fixtures)', type: :controller do +RSpec.describe 'Commit (JavaScript fixtures)' do include JavaScriptFixturesHelpers let_it_be(:project) { create(:project, :repository) } let_it_be(:user) { create(:user) } - let(:commit) { project.commit("master") } - - render_views + let_it_be(:commit) { project.commit("master") } before(:all) do clean_frontend_fixtures('commit/') + clean_frontend_fixtures('api/commits/') + + project.add_maintainer(user) end before do - project.add_maintainer(user) - sign_in(user) allow(SecureRandom).to receive(:hex).and_return('securerandomhex:thereisnospoon') end - it 'commit/show.html' do - params = { - namespace_id: project.namespace, - project_id: project, - id: commit.id - } + after(:all) do + remove_repository(project) + end + + describe Projects::CommitController, '(JavaScript fixtures)', type: :controller do + render_views + + before do + sign_in(user) + end + + it 'commit/show.html' do + params = { + namespace_id: project.namespace, + project_id: project, + id: commit.id + } + + get :show, params: params + + expect(response).to be_successful + end + end + + describe API::Commits, '(JavaScript fixtures)', type: :request do + include ApiHelpers - get :show, params: params + it 'api/commits/commit.json' do + get api("/projects/#{project.id}/repository/commits/#{commit.id}", user) - expect(response).to be_successful + expect(response).to be_successful + end end end diff --git a/spec/frontend/fixtures/emojis.rb b/spec/frontend/fixtures/emojis.rb new file mode 100644 index 00000000000..b95c7632917 --- /dev/null +++ b/spec/frontend/fixtures/emojis.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe 'Emojis (JavaScript fixtures)', type: :request do + include JavaScriptFixturesHelpers + + before(:all) do + clean_frontend_fixtures('emojis/') + end + + it 'emojis/emojis.json' do |example| + get '/-/emojis/1/emojis.json' + + expect(response).to be_successful + end +end diff --git a/spec/frontend/fixtures/metrics_dashboard.rb b/spec/frontend/fixtures/metrics_dashboard.rb index b5dee7525f6..6ee730f5c3d 100644 --- a/spec/frontend/fixtures/metrics_dashboard.rb +++ b/spec/frontend/fixtures/metrics_dashboard.rb @@ -6,10 +6,11 @@ RSpec.describe MetricsDashboard, '(JavaScript fixtures)', type: :controller do include JavaScriptFixturesHelpers include MetricsDashboardHelpers - let(:user) { create(:user) } - let(:project) { project_with_dashboard('.gitlab/dashboards/test.yml') } - let(:environment) { create(:environment, project: project) } - let(:params) { { environment: environment } } + let_it_be(:user) { create(:user) } + let_it_be(:namespace) { create(:namespace, name: 'monitoring' )} + let_it_be(:project) { project_with_dashboard_namespace('.gitlab/dashboards/test.yml', namespace: namespace) } + let_it_be(:environment) { create(:environment, id: 1, project: project) } + let_it_be(:params) { { environment: environment } } before(:all) do clean_frontend_fixtures('metrics_dashboard/') @@ -24,6 +25,7 @@ RSpec.describe MetricsDashboard, '(JavaScript fixtures)', type: :controller do project.add_maintainer(user) allow(controller).to receive(:project).and_return(project) + allow(controller).to receive(:environment).and_return(environment) allow(controller) .to receive(:metrics_dashboard_params) .and_return(params) @@ -35,7 +37,9 @@ RSpec.describe MetricsDashboard, '(JavaScript fixtures)', type: :controller do it 'metrics_dashboard/environment_metrics_dashboard.json' do routes.draw { get "metrics_dashboard" => "anonymous#metrics_dashboard" } + response = get :metrics_dashboard, format: :json + expect(response).to be_successful end end diff --git a/spec/frontend/fixtures/services.rb b/spec/frontend/fixtures/services.rb index 0877998cc9d..43230301296 100644 --- a/spec/frontend/fixtures/services.rb +++ b/spec/frontend/fixtures/services.rb @@ -8,7 +8,7 @@ RSpec.describe Projects::ServicesController, '(JavaScript fixtures)', type: :con let(:admin) { create(:admin) } let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} let(:project) { create(:project_empty_repo, namespace: namespace, path: 'services-project') } - let!(:service) { create(:custom_issue_tracker_service, project: project, title: 'Custom Issue Tracker') } + let!(:service) { create(:custom_issue_tracker_service, project: project) } render_views diff --git a/spec/frontend/fixtures/static/mini_dropdown_graph.html b/spec/frontend/fixtures/static/mini_dropdown_graph.html index cd0b8dec3fc..cb55698b709 100644 --- a/spec/frontend/fixtures/static/mini_dropdown_graph.html +++ b/spec/frontend/fixtures/static/mini_dropdown_graph.html @@ -1,13 +1,13 @@ -<div class="js-builds-dropdown-tests dropdown dropdown js-mini-pipeline-graph"> -<button class="js-builds-dropdown-button" data-toggle="dropdown" data-stage-endpoint="foobar"> -Dropdown -</button> -<ul class="dropdown-menu mini-pipeline-graph-dropdown-menu js-builds-dropdown-container"> -<li class="js-builds-dropdown-list scrollable-menu"> -<ul></ul> -</li> -<li class="js-builds-dropdown-loading hidden"> -<span class="fa fa-spinner"></span> -</li> -</ul> +<div class="js-builds-dropdown-tests dropdown dropdown" data-testid="widget-mini-pipeline-graph"> + <button class="js-builds-dropdown-button" data-toggle="dropdown" data-stage-endpoint="foobar"> + Dropdown + </button> + <ul class="dropdown-menu mini-pipeline-graph-dropdown-menu js-builds-dropdown-container"> + <li class="js-builds-dropdown-list scrollable-menu"> + <ul></ul> + </li> + <li class="js-builds-dropdown-loading hidden"> + <span class="fa fa-spinner"></span> + </li> + </ul> </div> diff --git a/spec/frontend/fixtures/static/global_search_input.html b/spec/frontend/fixtures/static/search_autocomplete.html index 29db9020424..29db9020424 100644 --- a/spec/frontend/fixtures/static/global_search_input.html +++ b/spec/frontend/fixtures/static/search_autocomplete.html diff --git a/spec/frontend/fixtures/tags.rb b/spec/frontend/fixtures/tags.rb new file mode 100644 index 00000000000..b2a5429fac8 --- /dev/null +++ b/spec/frontend/fixtures/tags.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe 'Tags (JavaScript fixtures)' do + include JavaScriptFixturesHelpers + + let_it_be(:admin) { create(:admin) } + let_it_be(:project) { create(:project, :repository, path: 'tags-project') } + + before(:all) do + clean_frontend_fixtures('api/tags/') + end + + after(:all) do + remove_repository(project) + end + + describe API::Tags, '(JavaScript fixtures)', type: :request do + include ApiHelpers + + it 'api/tags/tags.json' do + get api("/projects/#{project.id}/repository/tags", admin) + + expect(response).to be_successful + end + end +end |