diff options
| -rw-r--r-- | .cypress/cypress/integration/regressions.js | 21 | ||||
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 3 |
3 files changed, 24 insertions, 1 deletions
diff --git a/.cypress/cypress/integration/regressions.js b/.cypress/cypress/integration/regressions.js index 3bd208ede..ca3c902d0 100644 --- a/.cypress/cypress/integration/regressions.js +++ b/.cypress/cypress/integration/regressions.js @@ -71,6 +71,27 @@ describe('Regression tests', function() { cy.contains(/These will be sent to Northampton Borough Council and also/); }); + it('remembers extra fields when you sign in during reporting', function() { + cy.server(); + cy.route('/report/new/ajax*').as('report-ajax'); + cy.visit('/around?lon=-2.295894&lat=51.526877&zoom=6&js=1'); + cy.get('#map_box').click(); + cy.wait('@report-ajax'); + cy.get('[id=category_group]').select('Licensing'); + cy.get('[id=subcategory_Licensing]').select('Skips'); + cy.get('[name=title]').type('Title'); + cy.get('[name=detail]').type('Detail'); + cy.get('[name=start_date').type('2019-01-01'); + cy.get('.js-new-report-user-show').click(); + cy.get('.js-new-report-show-sign-in').should('be.visible').click(); + cy.get('#form_username_sign_in').type('user@example.org'); + cy.get('[name=password_sign_in]').type('password'); + cy.get('[name=password_sign_in]').parents('form').submit(); + cy.get('#map_sidebar').should('contain', 'check and confirm your details'); + cy.wait('@report-ajax'); + cy.get('#form_start_date').should('have.value', '2019-01-01'); + }); + it('hides everything when duplicate suggestions are shown', function() { cy.server(); cy.route('/report/new/ajax*').as('report-ajax'); diff --git a/CHANGELOG.md b/CHANGELOG.md index ded29f2f4..3e2eea580 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ - Handle missing category when sending open311 reports #2502 - Fix label associations with category groups. #2541 - Hide category extras when duplicate suggestions shown. + - Retain extra data if signing in during reporting. - Front end improvements: - Set report title autocomplete to off to prevent email autocompleting - Development improvements: diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index c952236d4..519a01fee 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -440,9 +440,10 @@ $.extend(fixmystreet.set_up, { if (data && data.category_extra) { if ( $category_meta.length ) { $category_meta.replaceWith( data.category_extra ); + var $new_category_meta = $('#category_meta'); // Preserve any existing values $category_meta.find("[name]").each(function() { - $category_meta.find("[name="+this.name+"]").val(this.value); + $new_category_meta.find("[name="+this.name+"]").val(this.value); }); } else { $('#js-post-category-messages').prepend( data.category_extra ); |