Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
//-- copyright
// OpenProject is an open source project management software.
// Copyright (C) the OpenProject GmbH
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.
//
// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
// Copyright (C) 2006-2013 Jean-Philippe Lang
// Copyright (C) 2010-2013 the ChiliProject Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// See COPYRIGHT and LICENSE files for more details.
//++

import { CommonModule } from '@angular/common';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { of } from 'rxjs';
import { fireEvent, screen } from '@testing-library/dom';
import { WorkPackageSubjectComponent } from './wp-subject.component';
import { EditableAttributeFieldComponent } from 'core-app/shared/components/fields/edit/field/editable-attribute-field.component';
import { EditFormComponent } from 'core-app/shared/components/fields/edit/edit-form/edit-form.component';
import {
HalResourceEditingService,
} from 'core-app/shared/components/fields/edit/services/hal-resource-editing.service';
import { SchemaCacheService } from 'core-app/core/schemas/schema-cache.service';
import { DisplayFieldService } from 'core-app/shared/components/fields/display/display-field.service';
import { initializeCoreDisplayFields } from 'core-app/shared/components/fields/display/display-field.initializer';
import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service';
import { States } from 'core-app/core/states/states.service';
import { I18nService } from 'core-app/core/i18n/i18n.service';
import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
import { HalResource } from 'core-app/features/hal/resources/hal-resource';

describe('WorkPackageSubjectComponent', () => {
beforeEach(async () => {
const schemaStub = {
ofProperty: () => ({ type: 'String' }),
isAttributeEditable: () => true,
};

const registeredFields:Record<string, EditableAttributeFieldComponent> = {};

await TestBed.configureTestingModule({
imports: [CommonModule],
declarations: [WorkPackageSubjectComponent, EditableAttributeFieldComponent],
Comment thread
lwassermann marked this conversation as resolved.
providers: [
{ provide: ApiV3Service, useValue: {} },
{ provide: OPContextMenuService, useValue: { close: () => undefined } },
{ provide: States, useValue: {} },
{ provide: I18nService, useValue: { t: (key:string) => key } },
{ provide: SchemaCacheService, useValue: { of: () => schemaStub } },
{
provide: EditFormComponent,
useValue: {
register: (field:EditableAttributeFieldComponent) => { registeredFields[field.fieldName] = field; },
activate: (fieldName:string) => {
registeredFields[fieldName].editContainer.nativeElement.innerHTML = '<input type="text">';
return Promise.resolve();
},
},
},
{
provide: HalResourceEditingService,
useValue: {
temporaryEditResource: (resource:HalResource) => ({ values$: () => of(resource) }),
typedState: () => ({ hasValue: () => false }),
},
},
],
}).compileComponents();

initializeCoreDisplayFields(TestBed.inject(DisplayFieldService))();
});

function render(wpOverrides:Partial<WorkPackageResource> = {}):ComponentFixture<WorkPackageSubjectComponent> {
const fixture = TestBed.createComponent(WorkPackageSubjectComponent);
fixture.componentInstance.workPackage = { subject: 'Some subject', ...wpOverrides } as WorkPackageResource;
fixture.detectChanges();
return fixture;
}

it('renders the work package subject as a level 2 heading', () => {
const subject = 'Add some angular tests for wp-subject';
render({ subject });

expect(screen.getByRole('heading', { level: 2, name: subject })).toBeInTheDocument();
});

it('keeps the accessible heading while editing', async () => {
const subject = 'Add some angular tests for wp-subject';
render({ subject });

fireEvent.click(screen.getByRole('button', { name: `subject ${subject}`}));
Comment thread
lwassermann marked this conversation as resolved.
await screen.findByRole('textbox');

expect(screen.getByRole('heading', { level: 2, name: subject })).toBeInTheDocument();
});
Comment thread
lwassermann marked this conversation as resolved.
});
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
[wrapperClasses]="'work-packages--type-selector work-packages--subject-element -no-label'"
[fieldName]="'type'" />
</div>

<h2 class="sr-only">{{ workPackage.subject }}</h2>

<div class="work-packages--details--subject work-packages--subject-element">
<op-editable-attribute-field [resource]="workPackage"
[wrapperClasses]="'work-packages--details--subject work-packages--subject-element -no-label'"
Expand Down
3 changes: 1 addition & 2 deletions modules/bim/spec/features/card_view/select_card_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,7 @@
describe "opening" do
it "the full screen view via double click" do
cards.open_full_screen_by_doubleclick(work_package1)
expect(page).to have_css(".work-packages--details--subject",
text: work_package1.subject)
expect(page).to have_heading(work_package1.subject, level: 2, exact_text: true)
end

it "the split screen of the selected WP" do
Expand Down
2 changes: 1 addition & 1 deletion spec/features/work_packages/cancel_editing_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ def move_to_home_page(alert: true)
expect(wp_page).not_to have_alert_dialog

expect(page).to have_no_css("#wp-new-inline-edit--field-subject")
expect(page).to have_css(".work-packages--details--subject", text: work_package2.subject)
expect(page).to have_heading(work_package2.subject, level: 2, exact_text: true)

# Moving somewhere else
expect_active_edit(new_split_work_packages_path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,35 +36,34 @@
let(:wp_table) { Pages::WorkPackagesTable.new(project) }
let(:cards) { Pages::WorkPackageCards.new(project) }

let(:wp_1) do
let(:wp1) do
create(:work_package,
project:)
end
let(:wp_2) do
let(:wp2) do
create(:work_package,
project:)
end

before do
wp_1
wp_2
wp1
wp2

login_as(user)
wp_table.visit!
wp_table.expect_work_package_listed wp_1, wp_2
wp_table.expect_work_package_listed wp1, wp2
end

context "switching to mobile card view" do
context "in mobile card view" do
include_context "with mobile screen size"

it "can switch the representation automatically on mobile after a refresh" do
# It shows the elements as cards
cards.expect_work_package_listed wp_1, wp_2
cards.expect_work_package_listed wp1, wp2

# A single click leads to the full view
cards.select_work_package(wp_1)
expect(page).to have_css(".work-packages--details--subject",
text: wp_1.subject)
cards.select_work_package(wp1)
expect(page).to have_heading(wp1.subject, level: 2, exact_text: true)
page.go_back
# The query is however unchanged
expect(page).to have_no_css(".editable-toolbar-title--save")
Expand All @@ -74,8 +73,8 @@
# Since the query is unchanged, the WPs will be displayed as list on larger screens again
page.driver.browser.manage.window.resize_to(700, 1080)
page.driver.browser.navigate.refresh
wp_table.expect_work_package_listed wp_1, wp_2
wp_table.expect_work_package_order wp_1, wp_2
wp_table.expect_work_package_listed wp1, wp2
wp_table.expect_work_package_order wp1, wp2
end
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,7 @@ def uncheck_all
end

it do
expect(page).to have_css(".work-packages--details--subject",
text: work_package_1.subject)
expect(page).to have_heading(work_package_1.subject, level: 2, exact_text: true)
end
end

Expand Down
Loading