Merge master

Author: natsteinmetz

.gitignore

@@ -32,3 +32,7 @@ app/assets/.DS_Store
 # Files generated by the seed script
 /scripts/csv_to_seed_problems.log
 /scripts/new_seeds.rb
+
+# IDE related .idea folder
+.idea/
+

.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

Gemfile

@@ -37,6 +37,13 @@ group :development do
   gem "binding_of_caller"
 end
 
+# Setting up rspec tests
+group :development, :test do
+  gem 'rspec-rails', '~> 3.5'
+  gem 'capybara'
+  gem 'database_cleaner'
+end
+
 # Tagging
 gem 'acts-as-taggable-on', '~> 3.4'
 

Gemfile.lock

@@ -29,6 +29,8 @@ GEM
       tzinfo (~> 1.1)
     acts-as-taggable-on (3.5.0)
       activerecord (>= 3.2, < 5)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     arel (5.0.1.20140414130214)
     autoprefixer-rails (6.7.0)
       execjs
@@ -43,6 +45,13 @@ GEM
       sass (>= 3.2.19)
     bootstrap_form (2.5.3)
     builder (3.2.3)
+    capybara (2.12.0)
+      addressable
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
     coderay (1.1.1)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -51,7 +60,9 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
+    database_cleaner (1.5.3)
     debug_inspector (0.0.2)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
     execjs (2.7.0)
     hike (1.2.3)
@@ -68,9 +79,13 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
     minitest (5.10.1)
     multi_json (1.12.1)
+    nokogiri (1.7.0.1)
+      mini_portile2 (~> 2.1.0)
     pg (0.19.0)
+    public_suffix (2.0.5)
     rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -96,6 +111,23 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
     rdoc (4.3.0)
+    rspec-core (3.5.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     sass (3.2.19)
     sass-rails (4.0.5)
       railties (>= 4.0.0, < 5.0)
@@ -122,6 +154,8 @@ GEM
       thread_safe (~> 0.1)
     uglifier (3.0.4)
       execjs (>= 0.3.0, < 3)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
@@ -132,12 +166,15 @@ DEPENDENCIES
   binding_of_caller
   bootstrap-sass (~> 3.3.4)
   bootstrap_form
+  capybara
   coffee-rails (~> 4.0.0)
+  database_cleaner
   jbuilder (~> 2.0)
   jquery-rails
   pg
   rails (= 4.1.7)
   rails_12factor
+  rspec-rails (~> 3.5)
   sass-rails (~> 4.0.3)
   sdoc (~> 0.4.0)
   spring

README.md

@@ -147,3 +147,25 @@ Please do not commit and push directly to the master branch! The hooks/pre-commi
 $ cp hooks/pre-commit .git/hooks/
 $ chmod +x .git/hooks/pre-commit
 ```
+
+### Running the tests
+
+In order to run the tests, make sure all the gems are installed and the test environment is set up properly with working database. 
+
++ Set up:
+
+```
+$ bundle install
+$ bundle exec rake db:create RAILS_ENV=test
+$ bundle exec rake db:schema:load RAILS_ENV=test
+```
+
++ Run the tests with [RSpec Rails](https://github.com/rspec/rspec-rails):
+
+```
+$ bundle exec rspec -fd
+```
+
+Notes:
++ ```-fd``` stands for full details. You can also run tests by using commands ```bundle exec rspec``` or ```bundle exec rake``` to get an overview without details of each test.
++ If you are having trouble running bundle install, please make sure Nokogiri gem is installed on your machine. Full instructions can be found [here](http://www.nokogiri.org/tutorials/installing_nokogiri.html).

app/assets/images/static_pages/github_logo.png

@@ -47,3 +47,68 @@ p > a:hover {
 p > a:focus {
   color: $green;
 }
+.connect {
+  margin: 0 auto;
+  text-align: center;
+  padding-top: 15px;
+}
+.connect_icons {
+  width: 80%;
+  list-style: none;
+  display: inline;
+  padding: 0;
+}
+
+.connect_icons > li {
+   display: inline;
+}
+
+.connect img {
+  width: 45px;
+  margin: 5px 25px;
+}
+
+// a.tooltips {
+//   position: relative;
+//   display: inline;
+// }
+// a.tooltips span {
+//   position: absolute;
+//   width:140px;
+//   color: #FFFFFF;
+//   background: #000000;
+//   height: 30px;
+//   line-height: 30px;
+//   text-align: center;
+//   visibility: hidden;
+//   border-radius: 6px;
+// }
+// a.tooltips span:after {
+//   content: '';
+//   position: absolute;
+//   top: 100%;
+//   left: 50%;
+//   margin-left: -8px;
+//   width: 0; height: 0;
+//   border-top: 8px solid #000000;
+//   border-right: 8px solid transparent;
+//   border-left: 8px solid transparent;
+// }
+// a:hover.tooltips span {
+//   visibility: visible;
+//   opacity: 0.8;
+//   bottom: 30px;
+//   left: 50%;
+//   margin-left: -76px;
+//   z-index: 999;
+// }
+
+
+//media queries
+
+@media (max-width: 500px) {
+  .connect img {
+  width: 35px;
+  margin: 5px 10px;
+}
+}

app/assets/images/static_pages/google_groups_logo.png

@@ -19,9 +19,16 @@
     </p>
     <br>
     <p>
-      Want to learn more or be a part of the she’s coding team? <%= link_to "Connect with us", "/connect" %>, or check out our project management systems: <%= link_to "Github", "https://github.com/shescoding", target: "_blank" %>, <%= link_to "Google Group", "https://groups.google.com/forum/#!forum/shescoding", target: "_blank" %>, <%= link_to "Trello", "https://trello.com/shescoding", target: "_blank" %>, <%= link_to "Slack", "https://shescoding.slack.com/", target: "_blank" %>.
+      Want to learn more or be a part of the she’s coding team? <%= link_to "Connect with us", "/connect" %>, or check out our project management systems: 
     </p>
   </div>
+  <div class="connect">
+     <ul class="connect_icons">
+      <li><%= link_to image_tag("static_pages/github_logo.png"), "https://github.com/shescoding",  title: 'Github', rel: 'tooltip', class: 'tooltips', target: "_blank" %><!-- <span>She's Coding on Github</span> --></li>
+      <li><%= link_to image_tag("static_pages/google_groups_logo.png"), "https://groups.google.com/forum/#!forum/shescoding", title: 'Google Groups', rel: 'tooltip', target: "_blank" %></li>
+      <li><%= link_to image_tag("static_pages/trello_logo.png"), "https://trello.com/shescoding", title: 'Trello', rel: 'tooltip', target: "_blank" %></li>
+      <li><%= link_to image_tag("static_pages/slack_logo.png"), "https://shescoding.slack.com", title: 'Slack', rel: 'tooltip', target: "_blank" %></li>
+  </div>
   <div class='how-section-title'>
     Convert understanding into action - join the She's Coding team!
   </div>

app/assets/images/static_pages/slack_logo.png

@@ -94,7 +94,7 @@
                             <div class="team-member-name">Bri Dotson</div>
                             <div class="team-member-title">Contributor</div>
                             <div class="tooltip-description">
-                                Bri is a feminist, homebrewer, tinkerer, musician, and software developer.  She's trying to change the world one webapp and robot at a time. She is currently working as Software Engineer Intern Extraordinaire at EnergySavvy.
+                                Bri is a feminist, homebrewer, tinkerer, musician, and software developer.  She's trying to change the world one webapp and robot at a time. She is currently working as Software Engineer Extraordinaire at EnergySavvy.
                             </div>
                         </div>
                     </div>

app/assets/images/static_pages/trello_logo.png

@@ -0,0 +1,16 @@
+require "rails_helper"
+
+RSpec.describe Resource, :type => :model do
+  
+  describe 'Model Resource' do
+
+    let (:resource_one) { Resource.create( {title: "Imposter Syndrome", url: "https://counseling.caltech.edu/general/InfoandResources/Impostor", description: "General definition and information on the Imposter Syndrome, provided by the Caltech Counseling Center." } ) }
+
+    it "has title, description and url" do
+      expect(resource_one.title).to eq("Imposter Syndrome")
+      expect(resource_one.url).to eq("https://counseling.caltech.edu/general/InfoandResources/Impostor")
+      expect(resource_one.description).to eq("General definition and information on the Imposter Syndrome, provided by the Caltech Counseling Center.")
+    end
+
+  end
+end

app/assets/stylesheets/how.css.scss

@@ -0,0 +1,77 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
+# Prevent database truncation if the environment is production
+abort("The Rails environment is running in production mode!") if Rails.env.production?
+require 'spec_helper'
+require 'rspec/rails'
+require 'capybara/rails'
+require 'database_cleaner'
+# Add additional requires below this line. Rails is not loaded until this point!
+
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
+# run as spec files by default. This means that files in spec/support that end
+# in _spec.rb will both be required and run as specs, causing the specs to be
+# run twice. It is recommended that you do not name files matching this glob to
+# end with _spec.rb. You can configure this pattern with the --pattern
+# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
+#
+# The following line is provided for convenience purposes. It has the downside
+# of increasing the boot-up time by auto-requiring all files in the support
+# directory. Alternatively, in the individual `*_spec.rb` files, manually
+# require only the support files necessary.
+#
+# Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
+
+# Checks for pending migration and applies them before tests are run.
+# If you are not using ActiveRecord, you can remove this line.
+ActiveRecord::Migration.maintain_test_schema!
+
+RSpec.configure do |config|
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+
+  config.before(:suite) do
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.before(:each, :js => true) do
+    DatabaseCleaner.strategy = :truncation
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explicitly tag your specs with their type, e.g.:
+  #
+  #     RSpec.describe UsersController, :type => :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/docs
+  config.infer_spec_type_from_file_location!
+
+  # Filter lines from Rails gems in backtraces.
+  config.filter_rails_from_backtrace!
+  # arbitrary gems may also be filtered via:
+  # config.filter_gems_from_backtrace("gem name")
+
+  config.include Capybara::DSL
+end