Skip to content

Commit

Permalink
Add test for WP list next to ifc model viewer
Browse files Browse the repository at this point in the history
  • Loading branch information
HDinger committed Feb 18, 2020
1 parent eb91a1e commit 5dcca64
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 2 deletions.
2 changes: 1 addition & 1 deletion frontend/src/app/components/wp-grid/wp-grid.component.ts
Expand Up @@ -76,7 +76,7 @@ export class WorkPackagesGridComponent {

ngOnInit() {
this.dragInto = this.configuration.dragAndDropEnabled;
this.canDragOutOf = () => { return this.configuration.dragAndDropEnabled };
this.canDragOutOf = () => { return this.configuration.dragAndDropEnabled; };

this.wpTableHighlight
.updates$()
Expand Down
16 changes: 15 additions & 1 deletion modules/ifc_models/spec/features/model_viewer_spec.rb
Expand Up @@ -33,7 +33,8 @@

describe 'model viewer', type: :feature, js: true do
let(:project) { FactoryBot.create :project }
let(:role) { FactoryBot.create(:role, permissions: %i[view_ifc_models manage_ifc_models]) }
let(:work_package) { FactoryBot.create(:work_package, project: project) }
let(:role) { FactoryBot.create(:role, permissions: %i[view_ifc_models manage_ifc_models view_work_packages]) }

let(:user) do
FactoryBot.create :user,
Expand All @@ -48,10 +49,12 @@
end

let(:show_model_page) { Pages::IfcModels::Show.new(project, model.id) }
let(:card_view) { ::Pages::WorkPackageCards.new(project) }

context 'with all permissions' do
before do
login_as(user)
work_package
show_model_page.visit!
show_model_page.finished_loading
end
Expand All @@ -62,6 +65,11 @@
show_model_page.page_shows_a_toolbar true
show_model_page.sidebar_shows_viewer_menu true
end

it 'shows a work package list as cards next to the viewer' do
show_model_page.model_viewer_visible true
card_view.expect_work_package_listed work_package
end
end

context 'with only viewing permissions' do
Expand Down Expand Up @@ -96,6 +104,7 @@

before do
login_as(user_without_permissions)
work_package
show_model_page.visit!
end

Expand All @@ -108,5 +117,10 @@
show_model_page.page_shows_a_toolbar false
show_model_page.sidebar_shows_viewer_menu false
end

it 'shows no work package list next to the viewer' do
show_model_page.model_viewer_visible false
card_view.expect_work_package_not_listed work_package
end
end
end
6 changes: 6 additions & 0 deletions spec/support/pages/work_packages/work_package_cards.rb
Expand Up @@ -43,6 +43,12 @@ def expect_work_package_listed(*work_packages)
end
end

def expect_work_package_not_listed(*work_packages)
work_packages.each do |wp|
expect(page).not_to have_selector("wp-single-card[data-work-package-id='#{wp.id}']")
end
end

def expect_work_package_order(*ids)
retry_block do
rows = page.all 'wp-single-card'
Expand Down

0 comments on commit 5dcca64

Please sign in to comment.