Merge pull request #576 from contactashish13/issue-481

change in cypress for moving button to the right menu

Author: contactashish13

.travis.yml

@@ -81,4 +81,4 @@ after_deploy:
 - ". ./bin/deploy.sh"
 after_failure:
 - cat "logs/phpcs.log"
-- cat "logs/jslogs.log"
+- cat "logs/jslogs.log"

cypress/integration/free-sources.js

@@ -95,7 +95,7 @@ describe('Test Free - sources', function() {
             first_chart_content = Cypress.$('#' + id).html();
         });
 
-        cy.get('.visualizer-chart-action.visualizer-chart-edit').first().click();
+        cy.get('.visualizer-chart-action.visualizer-chart-edit').first().click({force:true});
 
         cy.wait( Cypress.env('wait') );
 
@@ -114,25 +114,38 @@ describe('Test Free - sources', function() {
                 cy.wrap($body).find('#json-chart-button').click();
 
                 cy.wrap($body).find('input[type="url"]#vz-import-json-url').clear().type( fileName, {force:true} );
-                cy.wrap($body).find('#visualizer-json-fetch').click().then( () => {
+                cy.wrap($body).find('#visualizer-json-fetch').click({force:true}).then( () => {
                     cy.wait( Cypress.env('wait') );
                     cy.wrap($body).find('#visualizer-json-parse').should('be.visible');
                     cy.wrap($body).find('#vz-import-json-root').should('be.visible');
-                    cy.wrap($body).find('#vz-import-json-root option').should('have.length', 1);
+                    cy.wrap($body).find('#vz-import-json-root option').should('have.length', 2);
+                    cy.wrap($body).find('#vz-import-json-root').invoke('prop', 'selectedIndex', 1);
                 });
 
-                cy.wrap($body).find('#visualizer-json-parse').click().then( () => {
+                cy.wrap($body).find('#visualizer-json-parse').click({force:true}).then( () => {
                     cy.wait( Cypress.env('wait') );
                     cy.wrap($body).find('#json-conclude-form').should('be.visible');
                     cy.wrap($body).find('.json-table tr').should('have.length', 15);
+
+                    /*
+                    // TODO: Alert does not get auto accepted
+                    // check alert, if no columns are selected.
+                    const stub = cy.stub();
+                    cy.on('window:alert', stub);
+
+                    cy.wrap($body).find('#json-chart-button').click().then( () => {
+                        expect(stub.getCall(0)).to.be.calledWith('Please select a few columns to include in the chart.');
+                    });
+                    */
+
                     cy.wrap($body).find('.json-table tbody tr td select').each( function( el, index ) {
                         if(index === 0){
                             cy.wrap(el).select('date');
                         }else{
                             cy.wrap(el).select('number');
                         }
                     });
-                    cy.wrap($body).find('#visualizer-json-conclude').click().then( () => {
+                    cy.wrap($body).find('#json-chart-button').click().then( () => {
                         cy.wait( Cypress.env('wait') );
                         cy.wrap($body).find('#settings-button').click();
                     });

js/frame.js

@@ -403,19 +403,21 @@
             }else{
                 // toggle from LHS form to chart
                 $( '#json-conclude-form' ).trigger('submit');
-                $('body').on('visualizer:json:form:submit', function() {
-                    var filter_button = $bttn;
-                    $( '#visualizer-json-screen' ).css("z-index", "-1").hide();
-                    $('#canvas').lock();
-                    filter_button.val( filter_button.attr( 'data-t-chart' ) );
-                    filter_button.html( filter_button.attr( 'data-t-chart' ) );
-                    filter_button.attr( 'data-current', 'chart' );
-                    end_ajax( $( '#visualizer-json-screen' ) );
-                    $( '#canvas' ).css("z-index", "1").show();
-                });
             }
         } );
 
+        $('body').on('visualizer:json:form:submit', function() {
+            var filter_button = $( '#json-chart-button' );
+            $( '#visualizer-json-screen' ).css("z-index", "-1").hide();
+            $('#canvas').lock();
+            filter_button.val( filter_button.attr( 'data-t-chart' ) );
+            filter_button.html( filter_button.attr( 'data-t-chart' ) );
+            filter_button.attr( 'data-current', 'chart' );
+            end_ajax( $( '#visualizer-json-screen' ) );
+            $( '#canvas' ).css("z-index", "1").show();
+        });
+
+
         // fetch the roots for the provided endpoint
         $( '#visualizer-json-fetch' ).on( 'click', function(e){
             e.preventDefault();