Improve environment redirects

Author: kyle-ssg

tests/project.test.js

@@ -3,6 +3,7 @@ const expect = require('chai').expect;
 const helpers = require('./helpers');
 
 const byId = helpers.byTestID;
+const url = `http://localhost:${process.env.PORT || 8080}`;
 
 module.exports = {
     '[Project Tests] - Create environment': function (browser) {
@@ -29,6 +30,8 @@ module.exports = {
             .waitForElementVisible("[name='confirm-env-name']")
             .setValue("[name='confirm-env-name']", 'StagingInternal')
             .click('#confirm-delete-env-btn')
+            .waitForElementVisible(byId('features-page'));
+        browser.url(`${url}/projects`)
             .waitForElementVisible('#project-select-page');
     },
     '[Project Tests] - View project': function (browser) {

web/components/pages/EnvironmentSettingsPage.js

@@ -48,7 +48,12 @@ const EnvironmentSettingsPage = class extends Component {
     };
 
     onRemoveEnvironment = () => {
-        this.context.router.history.replace('/projects');
+        const envs = ProjectStore.getEnvs();
+        if (envs && envs.length) {
+            this.context.router.history.replace(`/project/${this.props.match.params.projectId}/environment` + `/${envs[0].api_key}/features`);
+        } else {
+            this.context.router.history.replace(`/project/${this.props.match.params.projectId}/environment/create`);
+        }
     };
 
     saveEnv = (e) => {