Skip to content

Fix race condition #418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Corpratespaz merged 2 commits into from
Jun 29, 2023
Merged

Fix race condition #418

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d06b0f
Fix race condition
manuel-delvillar Jun 15, 2023
c9f69f7
Add new test without using the DOM
manuel-delvillar Jun 16, 2023
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
26 changes: 22 additions & 4 deletions ui/src/app/navigation/header.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {ComponentFixture, fakeAsync, TestBed, tick} from "@angular/core/testing"
import {HeaderComponent} from "./header.component"
import {AuthService} from "../auth/auth-service"
import {AuthServiceStub} from "../../../test/resource/mock-stubs"
import {RouterTestingModule} from "@angular/router/testing"
import {AppConfig} from "../app.config"
import {EnvironmentService} from "../core/environment.service"
Expand All @@ -13,6 +12,8 @@ import {MyWorkspaceComponent} from "../my-workspace/my-workspace.component"
import {RichSkillsLibraryComponent} from "../richskill/library/rich-skills-library.component"
import {ButtonAction} from "../auth/auth-roles"
import {By} from "@angular/platform-browser"
import { Idle, IdleExpiry } from "@ng-idle/core"
import { Keepalive } from "@ng-idle/keepalive"

describe("HeaderComponent", () => {

Expand All @@ -30,7 +31,10 @@ describe("HeaderComponent", () => {
AppConfig,
ConcreteService,
Location,
{provide: AuthService, useClass: AuthServiceStub},
AuthService,
Idle,
IdleExpiry,
Keepalive
],
imports: [
HttpClientModule,
Expand Down Expand Up @@ -77,12 +81,26 @@ describe("HeaderComponent", () => {
expect(component.canHaveWorkspace).toBeFalse()
})

xit("my workspace is visible when user has role admin or curator", (done) => {
it("canHaveWorkspace should be false", () => {
const authService = TestBed.inject(AuthService)
spyOn(authService, "getRole").and.returnValue("ROLE_Osmt_Viewer")
component.canHaveWorkspace = component["authService"].isEnabledByRoles(ButtonAction.MyWorkspace)
expect(component.canHaveWorkspace).toBeFalse()
})

it("canHaveWorkspace should be true", () => {
const authService = TestBed.inject(AuthService)
spyOn(authService, "getRole").and.returnValue("ROLE_Osmt_Admin")
component.canHaveWorkspace = component["authService"].isEnabledByRoles(ButtonAction.MyWorkspace)
expect(component.canHaveWorkspace).toBeTrue()
})

it("my workspace is visible when user has role admin or curator", (done) => {
component.canHaveWorkspace = true
spyOn(component, "showPublicNavbar").and.returnValue(false)
fixture.whenStable().then(
() => {
fixture.detectChanges()

const myWorkspace = fixture.debugElement.query(By.css("#li-my-workspace"))
expect(myWorkspace).toBeTruthy()
expect(component.canHaveWorkspace).toBeTrue()
Expand Down