diff --git a/client/src/components/CarbonEmissions/CarbonEmissions.test.js b/client/src/components/CarbonEmissions/CarbonEmissions.test.js
index 74e2b7c0f26..5dbc918557d 100644
--- a/client/src/components/CarbonEmissions/CarbonEmissions.test.js
+++ b/client/src/components/CarbonEmissions/CarbonEmissions.test.js
@@ -16,7 +16,7 @@ const testServerInstance = {
};
describe("CarbonEmissions/CarbonEmissions.vue", () => {
- it("correctly calculated carbon emissions.", async () => {
+ it("correctly calculates carbon emissions.", async () => {
const wrapper = mount(CarbonEmissions, {
propsData: {
estimatedServerInstance: testServerInstance,
diff --git a/client/src/components/CarbonEmissions/CarbonEmissionsCalculations.vue b/client/src/components/CarbonEmissions/CarbonEmissionsCalculations.vue
index bcade040336..7071729ea57 100644
--- a/client/src/components/CarbonEmissions/CarbonEmissionsCalculations.vue
+++ b/client/src/components/CarbonEmissions/CarbonEmissionsCalculations.vue
@@ -14,18 +14,16 @@ const dictionary = [
},
{
term: "Carbon Intensity",
- definition:
- "A measure of how much greenhouse gases are emitted when producing per unit of electricity produced.",
+ definition: "The amount greenhouse gases emitted per unit of electricity produced.",
},
{
term: "AWS EC2",
- definition:
- "An Amazon service which allows users to rent virtual computers upon which users can deploy their own web services.",
+ definition: "An Amazon service allowing users to rent virtual computers and deploy their own web services.",
},
{
term: "CO2e",
definition:
- "CO2e represents other types of greenhouse gases the have similar global warming potential as a metric unit amount of CO2 itself.",
+ "Other types of greenhouse gases that have similar global warming potential as a metric unit amount of CO2 itself.",
},
];
@@ -62,23 +60,21 @@ const greenAlgorithmsUrl = "https://www.green-algorithms.org/";
to it (in MB). Additionally, we require information about the CPU model of the server that ran the job.
In particular, we consider the CPU
- 1. In the case that we know the CPU specifications from the server, we proceed as normal.
+ 1. In the case that the server's CPU specifications are known, we proceed as normal.
- 2. When the CPU information isn't provided, we estimate a server configuration given the job's metrics
- and match this to comparable general purpose
+ 2. When no information is provided, we estimate the server's configuration by matching your job's CPU
+ and/or memory usage to a comparable general purpose
The power usage is then converted into energy usage (in kWh) by factoring in job runtime (in hours):
++ The power usage is then converted into energy usage (in kWh) by factoring in the job runtime (in hours): +
energy_needed_cpu = runtime * power_needed_cpu / 1000
@@ -109,8 +107,8 @@ const greenAlgorithmsUrl = "https://www.green-algorithms.org/";
- Finally we convert the energy usage into estimated carbon emissions (metric unit CO2e) by multiplying - the carbon intensity of the server location. + Finally, we convert the energy usage into estimated carbon emissions (in metric units CO2e) by + multiplying the carbon intensity of the server location.
diff --git a/client/src/components/JobMetrics/AwsEstimate.test.js b/client/src/components/JobMetrics/AwsEstimate.test.js
index adc12ac1a6e..31c8fa4d27d 100644
--- a/client/src/components/JobMetrics/AwsEstimate.test.js
+++ b/client/src/components/JobMetrics/AwsEstimate.test.js
@@ -4,13 +4,6 @@ import { getLocalVue } from "tests/jest/helpers";
import AwsEstimate from "./AwsEstimate";
import { mount } from "@vue/test-utils";
-// Ignore all axios calls, data is mocked locally -- just say "OKAY!"
-jest.mock("axios", () => ({
- get: async () => {
- return { response: { status: 200 } };
- },
-}));
-
const localVue = getLocalVue();
describe("JobMetrics/AwsEstimate.vue", () => {
@@ -43,7 +36,6 @@ describe("JobMetrics/AwsEstimate.vue", () => {
},
});
- // Wait for axios and rendering.
await flushPromises();
if (wrapper.find("#aws-estimate").exists()) {