Fixed the issue where we could not delete users #2558

src/Ombi/ClientApp/app/login/login.component.html

@@ -33,7 +33,7 @@ include the remember me checkbox
 
                         </div>
                     </div>
-                    <button class="btn btn-success" type="submit" [translate]="'Login.SignInButton'"></button>
+                    <button class="btn btn-success" type="submit" data-test='signinbtn' [translate]="'Login.SignInButton'"></button>
                     <a [routerLink]="['/reset']" class="forgot-password col-md-12">
                         <b [translate]="'Login.ForgottenPassword'"></b>
                     </a>

src/Ombi/ClientApp/app/usermanagement/usermanagement-user.component.html

@@ -1,5 +1,8 @@
 <h3 *ngIf="!edit">Create User</h3>
 <h3 *ngIf="edit && user"> User: {{user.userName}}</h3>
+
+<p-confirmDialog></p-confirmDialog>
+
 <button type="button" class="btn btn-primary-outline" style="float:right;" [routerLink]="['/usermanagement/']">Back</button>
 <div *ngIf="!edit || edit && user">
 
@@ -65,7 +68,7 @@
                                                 <div class="checkbox">
                                                     <input type="checkbox" [(ngModel)]="c.enabled" [value]="c.value" id="create{{c.value}}"
                                                         [attr.name]="'create' + c.value" ng-checked="c.enabled">
-                                                    <label for="create{{c.value}}">{{c.value | humanize}}</label>
+                                                    <label id="label{{c.value}}" for="create{{c.value}}">{{c.value | humanize}}</label>
 
                                                 </div>
                                             </div>
@@ -208,7 +211,7 @@
     </div>
     <div class="row">
         <div class="col-md-12">
-            <button *ngIf="!edit" type="button" class="btn btn-danger-outline" (click)="create()">Create</button>
+            <button *ngIf="!edit" type="button" data-test="createuserbtn" class="btn btn-danger-outline" (click)="create()">Create</button>
             <div *ngIf="edit">
                 <button type="button" class="btn btn-primary-outline" (click)="update()">Update</button>
                 <button type="button" class="btn btn-danger-outline" (click)="delete()">Delete</button>

src/Ombi/ClientApp/app/usermanagement/usermanagement.component.html

@@ -2,7 +2,7 @@
 
 
 
-<button type="button" class="btn btn-success-outline" [routerLink]="['/usermanagement/user']">Add User To Ombi</button>
+<button type="button" class="btn btn-success-outline" data-test="adduserbtn" [routerLink]="['/usermanagement/user']">Add User To Ombi</button>
 
 <button type="button" style="float:right;" class="btn btn-primary-outline"(click)="showBulkEdit = !showBulkEdit" [disabled]="!hasChecked()">Bulk Edit</button>
 <div *ngIf="plexEnabled">

src/Ombi/ClientApp/app/wizard/createadmin/createadmin.component.html

@@ -19,7 +19,7 @@
 
 <div class="form-group">
     <div style="text-align: center; margin-top: 20px">
-        <button (click)="createUser()" type="submit" class="btn btn-success-outline">Finish</button>
+        <button (click)="createUser()" data-test="createuserbtn" type="submit" class="btn btn-success-outline">Finish</button>
     </div>
 </div>
 </div>

src/Ombi/ClientApp/app/wizard/mediaserver/mediaserver.component.html

@@ -16,7 +16,7 @@
                     </a>
                 </div>
                 <div class="row">
-                    <button (click)="skip()" class="btn btn-primary-outline wizard-img" id="plexImg">
+                    <button (click)="skip()" data-test="skipbtn" class="btn btn-primary-outline wizard-img" id="plexImg">
                         Skip
                     </button>
                 </div>

src/Ombi/ClientApp/app/wizard/welcome/welcome.component.html

@@ -9,7 +9,7 @@
                 <small>we are just going to run though the initial Ombi setup!</small>
 
                 <div style="text-align: center; margin-top: 20px">
-                    <a (click)="next()" class="btn btn-primary-outline">Next</a>
+                    <a (click)="next()" data-test="nextbtn" class="btn btn-primary-outline">Next</a>
                 </div>
             </div>
         </div>

src/Ombi/cypress.json

@@ -0,0 +1,4 @@
+{
+  "projectId": "gms1wj",
+  "baseUrl": "http://localhost:3577"
+}

src/Ombi/cypress/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}

src/Ombi/cypress/integration/login.spec.js

@@ -0,0 +1,38 @@
+/// <reference types="Cypress" />
+
+describe('Login Page', function () {
+  it('Invalid Password', function () {
+    cy.visit('/');
+    cy.contains('Sign in');
+
+    cy.get('#inputEmail').type('automation');
+    cy.get('#inputPassword').type('incorrectpw');
+
+    cy.get('[data-test=signinbtn]').click();
+    cy.get('.ui-growl-title').should('be.visible');
+    cy.get('.ui-growl-title').next().contains('Incorrect username')
+  });
+
+  it('Invalid Username', function () {
+    cy.visit('/');
+    cy.contains('Sign in');
+
+    cy.get('#inputEmail').type('bad username');
+    cy.get('#inputPassword').type('incorrectpw');
+
+    cy.get('[data-test=signinbtn]').click();
+    cy.get('.ui-growl-title').should('be.visible');
+    cy.get('.ui-growl-title').next().contains('Incorrect username')
+  });
+
+  it('Correct Login', function () {
+    cy.visit('/');
+    cy.contains('Sign in');
+
+    cy.get('#inputEmail').type('automation');
+    cy.get('#inputPassword').type('password');
+
+    cy.get('[data-test=signinbtn]').click();
+    cy.url().should('include', '/search')
+  });
+})

src/Ombi/cypress/integration/usermanagement.spec.js

@@ -0,0 +1,48 @@
+/// <reference types="Cypress" />
+
+describe('User Management Page', function () {
+  beforeEach(function () {
+    cy.request({
+      method: 'POST',
+      url: 'http://localhost:3577/api/v1/token',
+      body: {
+          username: 'automation',
+          password: 'password',
+      }
+    })
+      .then((resp) => {
+        window.localStorage.setItem('id_token', resp.body.access_token)
+      });
+      
+    cy.visit('/usermanagement');
+  });
+
+  it('Loads users table', function () {
+    cy.contains("User Management");
+    cy.contains("Add User To Ombi");
+  });
+
+  it.only('Creates basic user', function(){
+    cy.get('[data-test=adduserbtn').click();
+    cy.url().should('include','/user');
+
+    // Setup the form
+    cy.get('#username').type("user1");
+    cy.get('#alias').type("alias1");
+    cy.get('#emailAddress').type("user1@emailaddress.com");
+    cy.get('#password').type("password");
+    cy.get('#confirmPass').type("password");
+
+    // setup the roles
+    cy.contains('Roles').click()
+    cy.get('#labelRequestTv').click();
+    cy.get('#labelRequestMovie').click();
+
+    // submit user
+    cy.get('[data-test=createuserbtn]').click();
+    
+    cy.get('.ui-growl-title').should('be.visible');
+    cy.get('.ui-growl-title').next().contains('has been created successfully')
+  });
+  
+})

src/Ombi/cypress/integration/wizard.spec.js

@@ -0,0 +1,21 @@
+describe('Wizard Setup Tests', function() {
+    it('Setup Wizard User', function() {
+      cy.visit('http://localhost:3577/');
+      cy.url().should('include', '/Wizard')
+
+      cy.get('[data-test=nextbtn]').click();
+        
+      // Media server page
+      cy.contains('Please choose your media server');
+      cy.get('[data-test=skipbtn]').click();
+
+      // Create user
+      cy.contains('Create the Admin account');
+      cy.get('#adminUsername').type('automation');
+      cy.get('#adminPassword').type('password');
+
+      // Submit user
+      cy.get('[data-test=createuserbtn]').click();
+      cy.contains('Sign in');
+    })
+  })

src/Ombi/cypress/plugins/index.js

@@ -0,0 +1,17 @@
+// ***********************************************************
+// This example plugins/index.js can be used to load plugins
+//
+// You can change the location of this file or turn off loading
+// the plugins file with the 'pluginsFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/plugins-guide
+// ***********************************************************
+
+// This function is called when a project is opened or re-opened (e.g. due to
+// the project's config changing)
+
+module.exports = (on, config) => {
+  // `on` is used to hook into various events Cypress emits
+  // `config` is the resolved Cypress config
+}

src/Ombi/cypress/support/commands.js

@@ -0,0 +1,25 @@
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+//
+//
+// -- This is a parent command --
+// Cypress.Commands.add("login", (email, password) => { ... })
+//
+//
+// -- This is a child command --
+// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This is will overwrite an existing command --
+// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

src/Ombi/cypress/support/index.js

@@ -0,0 +1,20 @@
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands'
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')

src/Ombi/cypress/tsconfig.json

@@ -0,0 +1,12 @@
+{
+    "compilerOptions": {
+      "allowJs": true,
+      "baseUrl": "../node_modules",
+      "types": [
+        "cypress"
+      ]
+    },
+    "include": [
+      "**/*.*"
+    ]
+  }

src/Ombi/package.json

@@ -7,7 +7,8 @@
     "lint": "tslint -p .",
     "publish": "gulp publish",
     "restore": "dotnet restore && yarn install",
-    "clean": "gulp clean"
+    "clean": "gulp clean",
+    "cypress": "cypress open"
   },
   "dependencies": {
     "@angular/animations": "^6.0.7",
@@ -90,5 +91,8 @@
   },
   "resolutions": {
     "@types/tapable": "1.0.0"
+  },
+  "devDependencies": {
+    "cypress": "^3.1.0"
   }
 }