diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-01-31 14:06:25 -0600 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-01-31 14:06:25 -0600 |
commit | 3a565d5d3a0cc610ea0bd114125606bed6e4dc34 (patch) | |
tree | 1012e38a6efa6edf2f26b1acf17f94e8e38de6d1 /spec/controllers | |
parent | e25f383ddc6b867dc4010be10518d79c663d7409 (diff) | |
parent | 560c93e60efd0ae5a1a6bed68a1ee3e74bf23737 (diff) | |
download | gitlab-ce-3a565d5d3a0cc610ea0bd114125606bed6e4dc34.tar.gz |
Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480
* master: (119 commits)
[ci skip] Fix example commands to refer to the correct versions
Use axios instead of jquery ajax for setCiStatusFavicon
refactor groups controller to match EE
Fix broken test
Introduce a new QA::Gitlab::Page::Component::Dropzone class
Gitaly Server info for admin panel
Add note about being in the `qa` directory for `bin/qa` to work
Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints
Fix not all events being shown in group dashboard
Add support for PreReceiveError in UserMergeBranch RPC
Migrate Git::Repository#delete_refs to Gitaly
Replace $.get in render math with axios
Move mr widget related links into a vue file
Make those files as close as EE to reduce conflicts
Don't assume postgresql in two initializers
Move Repository#can_be_merged? to Gitlab::Git::Repository
Remove brakeman from .codeclimate.yml since it's now covered by the sast CI job
Update Nokogiri to 1.8.2
Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheck
Remove Rugged exception in cache rescue
...
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/admin/gitaly_servers_controller_spec.rb | 15 | ||||
-rw-r--r-- | spec/controllers/groups_controller_spec.rb | 24 | ||||
-rw-r--r-- | spec/controllers/projects/issues_controller_spec.rb | 12 |
3 files changed, 51 insertions, 0 deletions
diff --git a/spec/controllers/admin/gitaly_servers_controller_spec.rb b/spec/controllers/admin/gitaly_servers_controller_spec.rb new file mode 100644 index 00000000000..b7378aa37d0 --- /dev/null +++ b/spec/controllers/admin/gitaly_servers_controller_spec.rb @@ -0,0 +1,15 @@ +require 'spec_helper' + +describe Admin::GitalyServersController do + describe '#index' do + before do + sign_in(create(:admin)) + end + + it 'shows the gitaly servers page' do + get :index + + expect(response).to have_gitlab_http_status(200) + end + end +end diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb index a9cfd964dd5..492fed42d31 100644 --- a/spec/controllers/groups_controller_spec.rb +++ b/spec/controllers/groups_controller_spec.rb @@ -85,6 +85,30 @@ describe GroupsController do end end + describe 'GET #activity' do + render_views + + before do + sign_in(user) + project + end + + context 'as json' do + it 'includes all projects in event feed' do + 3.times do + project = create(:project, group: group) + create(:event, project: project) + end + + get :activity, id: group.to_param, format: :json + + expect(response).to have_gitlab_http_status(200) + expect(json_response['count']).to eq(3) + expect(assigns(:projects).limit_value).to be_nil + end + end + end + describe 'POST #create' do context 'when creating subgroups', :nested_groups do [true, false].each do |can_create_group_status| diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb index 4a2998b4ccd..9656e7f7e74 100644 --- a/spec/controllers/projects/issues_controller_spec.rb +++ b/spec/controllers/projects/issues_controller_spec.rb @@ -102,6 +102,18 @@ describe Projects::IssuesController do expect(response).to redirect_to(namespace_project_issues_path(page: last_page, state: controller.params[:state], scope: controller.params[:scope])) end + + it 'does not use pagination if disabled' do + allow(controller).to receive(:pagination_disabled?).and_return(true) + + get :index, + namespace_id: project.namespace.to_param, + project_id: project, + page: (last_page + 1).to_param + + expect(response).to have_gitlab_http_status(200) + expect(assigns(:issues).size).to eq(2) + end end end |