forked from AustinCodingAcademy/javascript-workbook
-
Notifications
You must be signed in to change notification settings - Fork 0
Travel to mars #10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
abbygottlich
wants to merge
6
commits into
gh-pages
Choose a base branch
from
travelToMars
base: gh-pages
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Travel to mars #10
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d08232f
CrewMember and Ship classes created, along with the rickMartinez and …
abbygottlich ba17e38
EnterAShip function attempt #1
abbygottlich 5637233
function thoughts and notes
abbygottlich 216b7b3
'can enter a ship' function passed
abbygottlich b7aea18
all four tests pass
abbygottlich 98217b6
spaceTravelToMars all four tests passing
abbygottlich File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,59 +1,127 @@ | ||
| 'use strict'; | ||
| "use strict"; | ||
|
|
||
| let assert = require('assert'); | ||
| let assert = require("assert"); | ||
|
|
||
| let jobTypes = { | ||
| pilot: 'MAV', | ||
| mechanic: 'Repair Ship', | ||
| commander: 'Main Ship', | ||
| programmer: 'Any Ship!' | ||
| pilot: "MAV", | ||
| mechanic: "Repair Ship", | ||
| commander: "Main Ship", | ||
| programmer: "Any Ship!" | ||
| }; | ||
|
|
||
| // Your code here | ||
| // class #1 | ||
| // I created a class called CrewMember and gave it the attributes, 'name', 'job', and 'specialSkill' | ||
| // I also gave it the 'ship' attribute and set it to null, so we can push whichever ship we want into the class | ||
|
|
||
| class CrewMember { | ||
| constructor(name, job, specialSkill, ship) { | ||
| this.name = name; | ||
| this.job = job; | ||
| this.specialSkill = specialSkill; | ||
| this.ship = null; | ||
| } | ||
| enterShip(shipName) { | ||
| this.ship = shipName; | ||
| shipName.crew.push(this); | ||
| } | ||
| } | ||
|
|
||
| // class #2 | ||
| // I created a new class called 'Ship' and gave it the attributes, 'name', 'type', and 'ability' | ||
| // I also gave it the 'crew' attribute and set it to an empty array, so we can push whichever CrewMember we want into the array | ||
|
|
||
| class Ship { | ||
| constructor(name, type, ability, crew) { | ||
| this.name = name; | ||
| this.type = type; | ||
| this.ability = ability; | ||
| this.crew = []; | ||
| // this.missionStatement = ""; | ||
| } | ||
| //conditional for printing a mission statement | ||
| missionStatement(shipName) { | ||
| if (this.crew.length === 0) { | ||
| return "Can't perform a mission yet."; | ||
| } else { | ||
| return this.ability; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // I created a new instance of a CrewMember and passed in the same values listed in the CrewMember class | ||
| // I did not include 'ship' because that is the value we will be assigning later | ||
|
|
||
| const crewMember1 = new CrewMember("Rick Martinez", "pilot", "chemistry"); | ||
|
|
||
| // I created a new instance of a Ship and passed in the same values listed in the Ship class | ||
| // I did not include 'crew' because that is the value we will be assigning later | ||
|
|
||
| const mav = new Ship("Mars Accent Vehicle", "MAV", "Ascend into low orbit"); | ||
|
|
||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You should have the crewmember enter the ship. |
||
| //tests | ||
| if (typeof describe === 'function'){ | ||
| describe('CrewMember', function(){ | ||
| it('should have a name, a job, a specialSkill and ship upon instantiation', function(){ | ||
| var crewMember1 = new CrewMember('Rick Martinez', 'pilot', 'chemistry'); | ||
| assert.equal(crewMember1.name, 'Rick Martinez'); | ||
| assert.equal(crewMember1.job, 'pilot'); | ||
| assert.equal(crewMember1.specialSkill, 'chemistry'); | ||
| if (typeof describe === "function") { | ||
| describe("CrewMember", function() { | ||
| it("should have a name, a job, a specialSkill and ship upon instantiation", function() { | ||
| var crewMember1 = new CrewMember("Rick Martinez", "pilot", "chemistry"); | ||
| assert.equal(crewMember1.name, "Rick Martinez"); | ||
| assert.equal(crewMember1.job, "pilot"); | ||
| assert.equal(crewMember1.specialSkill, "chemistry"); | ||
| assert.equal(crewMember1.ship, null); | ||
| }); | ||
|
|
||
| it('can enter a ship', function(){ | ||
| let mav = new Ship('Mars Ascent Vehicle', 'MAV', 'Ascend into low orbit'); | ||
| let crewMember1 = new CrewMember('Rick Martinez', 'pilot', 'chemistry'); | ||
| it("can enter a ship", function() { | ||
| let mav = new Ship("Mars Ascent Vehicle", "MAV", "Ascend into low orbit"); | ||
| let crewMember1 = new CrewMember("Rick Martinez", "pilot", "chemistry"); | ||
| crewMember1.enterShip(mav); | ||
| assert.equal(crewMember1.ship, mav); | ||
| assert.equal(mav.crew.length, 1); | ||
| assert.equal(mav.crew[0], crewMember1); | ||
| }); | ||
| }); | ||
|
|
||
| describe('Ship', function(){ | ||
| it('should have a name, a type, an ability and an empty crew upon instantiation', function(){ | ||
| let mav = new Ship('Mars Ascent Vehicle', 'MAV', 'Ascend into low orbit'); | ||
| assert.equal(mav.name, 'Mars Ascent Vehicle'); | ||
| assert.equal(mav.type, 'MAV'); | ||
| assert.equal(mav.ability, 'Ascend into low orbit'); | ||
| describe("Ship", function() { | ||
| it("should have a name, a type, an ability and an empty crew upon instantiation", function() { | ||
| let mav = new Ship("Mars Ascent Vehicle", "MAV", "Ascend into low orbit"); | ||
| assert.equal(mav.name, "Mars Ascent Vehicle"); | ||
| assert.equal(mav.type, "MAV"); | ||
| assert.equal(mav.ability, "Ascend into low orbit"); | ||
| assert.equal(mav.crew.length, 0); | ||
| }); | ||
|
|
||
| it('can return a mission statement correctly', function(){ | ||
| let mav = new Ship('Mars Ascent Vehicle', 'MAV', 'Ascend into low orbit'); | ||
| let crewMember1 = new CrewMember('Rick Martinez', 'pilot', 'chemistry'); | ||
| let hermes = new Ship('Hermes', 'Main Ship', 'Interplanetary Space Travel'); | ||
| let crewMember2 = new CrewMember('Commander Lewis', 'commander', 'geology'); | ||
| it("can return a mission statement correctly", function() { | ||
| //mav is a new instance of a ship (name, type, ability) | ||
| let mav = new Ship("Mars Ascent Vehicle", "MAV", "Ascend into low orbit"); | ||
| //crewMember1 is a new instance of a crewMember (name, job, specialSkill) | ||
| let crewMember1 = new CrewMember("Rick Martinez", "pilot", "chemistry"); | ||
| //hermes is a new instance of a ship (name, type, ability) | ||
| let hermes = new Ship( | ||
| "Hermes", | ||
| "Main Ship", | ||
| "Interplanetary Space Travel" | ||
| ); | ||
| //crewMember2 is a new instance of a crewMember (name, job, specialSkill) | ||
| let crewMember2 = new CrewMember( | ||
| "Commander Lewis", | ||
| "commander", | ||
| "geology" | ||
| ); | ||
| //possible default statement | ||
| assert.equal(mav.missionStatement(), "Can't perform a mission yet."); | ||
| assert.equal(hermes.missionStatement(), "Can't perform a mission yet."); | ||
|
|
||
| //if ship is empty, "can't perform mission yet" is the mission statement | ||
| //once crewMember enters ship, ship's ability becomes the missionstatement | ||
| crewMember1.enterShip(mav); | ||
| assert.equal(mav.missionStatement(), "Ascend into low orbit"); | ||
|
|
||
| crewMember2.enterShip(hermes); | ||
| assert.equal(hermes.missionStatement(), "Interplanetary Space Travel"); | ||
| }); | ||
| }); | ||
| //write a conditional | ||
| } | ||
|
|
||
| // I think this last one will be some sort of conditional | ||
| // If a ship doesn't have any crew members in the crew array, return 'Can't perform a mission yet.' | ||
| // If they have at least 1 crew member, return its corresponding mission statement. | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Your putting the entire class in the crew array.