In this exercise, you are going to see a typical end-to-end workflow for a Java developer. You should have completed the labs that set up automated build and release (this is a CI/CD pipeline. In this scenario, you will launch the MyShuttle application and discover a bug. You will then use the Exploratory Testing extension to create a Bug work item in VSTS. You will then branch the code for fixing the bug. Once the bug is fixed on the branch, you will merge the code in via a Pull Request and code review. This will then automatically queue the build/release pipeline and your fix will be deployed.

This exercise assumes you have completed the exercises to create a Team Project and have set up the Docker private VSTS agent. You should also have completed the labs to set up an automated build for both the MyShuttleCalc and the MyShuttle2 repos as well as the release management lab. This exercise uses a team project named jdev-labs, though your team project name may differ.

Install the Exploratory Testing Extension for Chrome

In this task you will install the Exploratory Testing extension on Chrome browser.

  1. Open chrome and navigate to https://chrome.google.com/webstore. Enter exploratory testing into the search box. Find the Test & Feedback extension from Microsoft Corporation and click Add to Chrome. Click Install in the dialog.

    Adding the Exploratory Test Extension to Chrome

  2. Once installed, a test extension beaker icon appears in the top right of the Chrome toolbar. Click it to launch the UI.

  3. Click on the gear icon to open the settings. Select Connected and enter your VSTS account URL and click Next.

    Connect to VSTS

  4. Select your team project and expand it and select the default project team (which should have the same name as your team project). Click Save.

    Select the Team to Connect to

    Your team name may be different

Configure Branch Policies

In this task you will enforce quality on the master branch by creating branch policies.

  1. In Chrome, connect to your VSTS Team Project. Click on Code to open the Code Hub.

  2. Click the Repo dropdown and select Manage Repositories.

    Manage Repositories

  3. In the tree, expand the MyShuttle2 repo and click on the master branch. Click the Branch Policies tab.

    Open branch policies

  4. Select the Protect this branch checkbox.

  5. Select Check for linked work items and set the option to required.

  6. Under Build validation, click Add build policy. Select MyShuttle2 from the list of build definitions and click Save.

    Policy configuration

Log a Bug using the Exploratory Test Extension

In this task you will start a test session, discover a bug in the MyShuttle app and log it to VSTS.

  1. In the Test extension toolbar of the Exploratory Test extension, click the Play icon to start a testing session.

    Start a test sessions

  2. Enter http://localhost:8081/myshuttledev in the toolbar to navigate to the application. Enter fred for the username and fredpassword for the password and click Log In.

    Log in to the app

  3. On the Dashboard page, click Access Your Fare History to navigate to the fare history page.

  4. If you look at the totals for the Fare and Driver column in the table, you will notice that the total for the driver column is incorrect.

  5. Click the Test Extension beaker icon and click the Camera icon (capture image).

    Click Add Screenshot

  6. Capture the grid with the incorrect total. Annotate the image appropriately and click the check (accept) icon.

    Capture an image of the Bug

  7. Click the Test Extension beaker icon and click on flyout (lower right) of the icon with the page and exclamation mark (new bug). From the menu click Create bug.

    Create a new bug

  8. In the title box, enter Driver total incorrect and click Save.

    Log the Bug

  9. Once the bug has been created, click the Stop button in the Test Extension toolbar to end the test session.

  10. Navigate to your VSTS team project. Click Work to navigate to the Work Hub. In the toolbar, enter driver into the Search Work Items box and press enter or click the search icon.

    Search for the Bug

  11. You should see the Bug that you logged. Take a moment to review the Repro Steps.

    Bug details

  12. Assign the Bug to yourself and change the state to Active. Click Save.

    Assign the Bug

Fix the Bug

In this task you will create a branch of the code to fix the Bug. You will then checkout the branch, fix the bug and commit the code. You will then create a Pull Request to merge the fix into master and see that this triggers the CI/CD pipeline to automatically deploy the fix to the dev environment.

  1. Launch IntelliJ if it is not already open. Open the MyShuttle2 project.

  2. Click VCS -> Git -> Show History to show the Version Control panel. In the panel, click Work Items. You should see the Bug.

    Create a branch from the Work Item

  3. In the dialog, change the branch name to totalsBug and click Create.

    New branch

  4. The branch is created both locally and in the remote (on VSTS). The VSTS extension informs you that the new branch has been created and has been associated with the Bug.

    Notifications when creating a branch

  5. In the project view, browse to src/main/java/com.microsoft.example/servlet and open the LoginServlet class.

  6. Around line 35, you will see the cause of the bug: the totalDriverFee value is being calculated but the driverFeeTotal session attribute is being set to the totalFareForDriver value (seems like a classic copy/paste error).

    Change this line of code:

         session.setAttribute("driverFeeTotal", totalFareforDriver);
    

    to

         session.setAttribute("driverFeeTotal", totalDriverFee);
    
  7. Commit your changes by selecting VCS -> Git -> Commit File. Enter Fixing totals bug as the Commit message.

  8. On the upper right of the Commit message box there is a VSTS icon. Click it to open the Work Item dialog. This dialog would allow you to associate your commit with a work item. Close the dialog by pressing Cancel.

    In this case we do not need to associate the checkin with the Bug since the branch is already associated with the Bug.

    Associate a work item with a commit

  9. Hover the mouse over the Commit button and select Commit and Push to push the changes to VSTS. In the Push commits dialog click the Push button.

    Commit and Push

  10. Now that the fix has been pushed to VSTS on a branch, you can create a Pull Request (PR). In the Code History panel click the Pull Request tab. Click the green + button to add a new Pull Request. Accept the defaults and click Create Pull Request.

    Create Pull Request

  11. Once the PR has been created, right-click on it in the PR list and click Open in Browser. You should see that the build is running (this is the build mandated by the Branch Policy you set up earlier).

    Build is running to validate the PR

  12. Click on the Files tab to open the file compare. Note the changes.

    PR File Compare

    You can comment on the code or files in the PR and have conversations with the team throughout the review process.

  13. Click Approve to approve the PR.

  14. Now that the policies have been fulfilled, you can complete the PR which will merge the changes into master (the target branch). Click Complete to do the merge.

  15. In the dialog, accept the defaults and click Complete merge.

    Complete the merge

  16. The PR completion triggers a new build from the master branch, which in turn will trigger a release. It also transitions the Bug work item state to Resolved.

  17. Click on Builds to view your build progress. When the build completes, you will see the unit test and code coverage results as well as SonarQube analysis and quality gates (if you have configured SonarQube integration).

  18. Click on Releases and open the latest release which should have triggered from the PR merge build completion event.

  19. On the Release Summary page, you will see the linked Bug work item.

    Linked work item in Release

  20. Click on Commits to view the incoming commits for this release. There is the commit to fix the bug as well as the commit to merge into master.

    Linked commits

  21. Click on the Tests tab to view the test results. The UI tests should be successful.

  22. Launch the MyShuttle2 app by navigating to the URL http://localhost:8081/myshuttledev. Log in again and verify that the totals column value is correct and the Bug has been fixed.

    The bug has been fixed