Merge pull request #3 from learn-co-curriculum/wip

Wip

Author: jmburges

CONTRIBUTING.md

@@ -0,0 +1,37 @@
+# Contributing to Learn.co Curriculum
+
+We're really exited that you're about to contribute to the [open curriculum](https://learn.co/content-license) on [Learn.co](https://learn.co). If this is your first time contributing, please continue reading to learn how to make the most meaningful and useful impact possible.
+
+## Raising an Issue to Encourage a Contribution
+
+If you notice a problem with the curriculum that you believe needs improvement
+but you're unable to make the change yourself, you should raise a Github issue
+containing a clear description of the problem. Include relevant snippets of
+the content and/or screenshots if applicable. Curriculum owners regularly review
+issue lists and your issue will be prioritized and addressed as appropriate.
+
+## Submitting a Pull Request to Suggest an Improvement
+
+If you see an opportunity for improvement and can make the change yourself go
+ahead and use a typical git workflow to make it happen:
+
+* Fork this curriculum repository
+* Make the change on your fork, with descriptive commits in the standard format
+* Open a Pull Request against this repo
+
+A curriculum owner will review your change and approve or comment on it in due
+course.
+
+# Why Contribute?
+
+Curriculum on Learn is publicly and freely available under Learn's
+[Educational Content License](https://learn.co/content-license). By
+embracing an open-source contribution model, our goal is for the curriculum
+on Learn to become, in time, the best educational content the world has
+ever seen.
+
+We need help from the community of Learners to maintain and improve the
+educational content. Everything from fixing typos, to correcting
+out-dated information, to improving exposition, to adding better examples,
+to fixing tests—all contributions to making the curriculum more effective are
+welcome.

spec/models/puppy_spec.rb

@@ -0,0 +1,34 @@
+describe 'Puppy class' do 
+  let!(:puppy) { Puppy.new("brad", "black lab", 2) }
+
+  it 'can create a new instance of the puppy class' do
+    expect(Puppy.new("brad", "black lab", 2)).to be_an_instance_of(Puppy)
+  end
+
+  it 'can read a puppy name' do 
+    expect(puppy.name).to eq("brad")
+  end
+
+  it 'can read a puppy breed' do 
+    expect(puppy.name).to eq("black lab")
+  end
+
+  it 'can read a puppy age' do 
+    expect(puppy.name).to eq(2)
+  end
+
+  it 'can change puppy age' do 
+    puppy.age = 3
+    expect(puppy.age).to eq(3)
+  end
+
+  it 'can change puppy name' do 
+    puppy.name = "brad the beast"
+    expect(puppy.name).to eq("brad the beast")
+  end
+
+  it 'can change puppy breed' do 
+    puppy.breed = "the best black lab"
+    expect(puppy.breed).to eq("the best black lab")
+  end
+end

spec/sinatra_basic_forms_lab_spec.rb

@@ -1,62 +1,46 @@
+describe App do
 
-require 'pry'
-describe "Puppy Adoption Site" do
-  describe "GET '/'" do
-    before(:each) do
+  describe 'GET /' do
+    
+    it 'sends a 200 status code' do
       get '/'
-    end
-
-    it "returns a 200 status code" do
       expect(last_response.status).to eq(200)
     end
 
-    it "renders a welcome" do
-      expect(last_response.body).to include("Welcome to the puppy adoption site!")
-      expect(last_response.body).to include("Click Here To List A Puppy")
+    it 'renders welcome' do 
+      visit '/'
+      expect(page).to have_link("Click Here To List A Puppy")
     end
   end
 
-  describe "GET '/new'" do
-    before(:each) do
-      get '/new'
-    end
-
-    it "returns a 200 status code" do
+  describe 'GET /NEW' do 
+    it 'sends a 200 status code' do
+      get '/'
       expect(last_response.status).to eq(200)
     end
 
-    it "renders a new form element on the page" do
-      expect(last_response.body).to include("<form")
-      expect(last_response.body).to include("</form>")
-    end
-
-    it "renders the puppy input fields for name, breed, and age attributes on the page" do
-      # binding.pry
-      expect(last_response.body).to include("name")
-      expect(last_response.body).to include("breed")
-      expect(last_response.body).to include("age")
+    it 'renders the form' do
+      visit '/new'
+      expect(page).to have_selector("form")
+      expect(page).to have_field(:name)
+      expect(page).to have_field(:breed)
+      expect(page).to have_field(:age)
     end
   end
 
-  describe "POST '/puppy'" do
-    before do
-      post '/puppy', {
-          "name"=>"Ian",
-          "breed"=>"Dalmation",
-          "age"=>"6",
-      }
-    end
-
-    it "returns a 200 status code" do
-      expect(last_response.status).to eq(200)
-    end
+  describe 'POST /' do
+    it "displays the puppy" do 
+      visit '/new'
 
-    it "displays the puppy information upon form submission" do
-      expect(last_response.body).to include("Ian")
-      expect(last_response.body).to include("Dalmation")
-      expect(last_response.body).to include("6")
+      fill_in(:name, :with => "Butch")
+      fill_in(:breed, :with => "Mastiff")
+      fill_in(:age, :with => "6 months")
+      click_button "submit"
+      expect(page).to have_text("Puppy Name:\nButch")
+      expect(page).to have_text("Puppy Breed:\nMastiff")
+      expect(page).to have_text("Puppy Age:\n6 months")
     end
+  end
 
 
-  end
 end