diff options
author | Mike Greiling <mike@pixelcog.com> | 2017-10-12 17:52:09 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-10-12 17:52:09 -0500 |
commit | 53e11239ce9e7f9513c890a78df41c611bcc2ae1 (patch) | |
tree | 08300d49b78dff43f95e52cc298fa8732b9a32a9 /spec/features/dashboard | |
parent | d8cc4540ab83c98a09b11d1654fac593c47384c8 (diff) | |
parent | 8d47e9f8e13c2ca43520b348dde0424fe6460cc9 (diff) | |
download | gitlab-ce-53e11239ce9e7f9513c890a78df41c611bcc2ae1.tar.gz |
Merge branch 'master' into sh-headless-chrome-support
* master: (104 commits)
Update licenses
fix a wrong method call in the refactor
fix a whitespace
fix for discussion
Update templates via:
Update doc accordingly to:
Cache issuable template names
Fix the format of rugged alternate directory list
Match full file path in FileDetector
Fixes from CSS refactor
Resolve "Prometheus service page shows error"
Explicit state integration deletion
Move all API authentication code to APIGuard
Shorten example translation for inclusive language
[ci-skip] add changelog
fix the merger override to remove source branch
add spec
Removed d3.js from the users and graphs bundle
Cleanup data-page attribute after each Karma test
Update template description wording
...
Diffstat (limited to 'spec/features/dashboard')
-rw-r--r-- | spec/features/dashboard/groups_list_spec.rb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/spec/features/dashboard/groups_list_spec.rb b/spec/features/dashboard/groups_list_spec.rb index 4c120b09345..1cb78410957 100644 --- a/spec/features/dashboard/groups_list_spec.rb +++ b/spec/features/dashboard/groups_list_spec.rb @@ -1,14 +1,15 @@ require 'spec_helper' feature 'Dashboard Groups page', :js do - let!(:user) { create :user } - let!(:group) { create(:group) } - let!(:nested_group) { create(:group, :nested) } - let!(:another_group) { create(:group) } + let(:user) { create :user } + let(:group) { create(:group) } + let(:nested_group) { create(:group, :nested) } + let(:another_group) { create(:group) } it 'shows groups user is member of' do group.add_owner(user) nested_group.add_owner(user) + expect(another_group).to be_persisted sign_in(user) visit dashboard_groups_path @@ -22,6 +23,7 @@ feature 'Dashboard Groups page', :js do before do group.add_owner(user) nested_group.add_owner(user) + expect(another_group).to be_persisted sign_in(user) @@ -51,7 +53,7 @@ feature 'Dashboard Groups page', :js do end end - describe 'group with subgroups' do + describe 'group with subgroups', :nested_groups do let!(:subgroup) { create(:group, :public, parent: group) } before do @@ -90,7 +92,8 @@ feature 'Dashboard Groups page', :js do end describe 'when using pagination' do - let(:group2) { create(:group) } + let(:group) { create(:group, created_at: 5.days.ago) } + let(:group2) { create(:group, created_at: 2.days.ago) } before do group.add_owner(user) @@ -102,12 +105,9 @@ feature 'Dashboard Groups page', :js do visit dashboard_groups_path end - it 'shows pagination' do - expect(page).to have_selector('.gl-pagination') + it 'loads results for next page' do expect(page).to have_selector('.gl-pagination .page', count: 2) - end - it 'loads results for next page' do # Check first page expect(page).to have_content(group2.full_name) expect(page).to have_selector("#group-#{group2.id}") |