hounded

openfarmcc · Apr 8, 2015 · d8ba3fe · d8ba3fe
1 parent 133e41d
commit d8ba3fe
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/app/assets/stylesheets/styles/_variables.scss b/app/assets/stylesheets/styles/_variables.scss
@@ -10,8 +10,8 @@ $of-orange: #e69138;
 $of-blue:   #3c78d8;
 $of-purple: #674ea7;
 $of-green:  #6aa84f;
-$of-green2: #5E9546;
-$of-blue-grey: #ECEFF0;
+$of-green2: #5e9546;
+$of-blue-grey: #eCeff0;
 $of-red:    #cc0000;
 $of-yellow: #f1c232;
 $of-dark:   #4a4a4a;
@@ -22,11 +22,11 @@ $white: #ffffff;
 $gray-bg:   #f9f9f9;
 
 // We use these as default colors throughout
-$primary-color:   #99B36C; // #008CBA;
+$primary-color:   #99b36c; // #008CBA;
 $secondary-color: #e7e7e7;
 $alert-color:     #ff6666;
-$success-color:   #74E29D;
-$warning-color:   #F5C18C;
+$success-color:   #74e29d;
+$warning-color:   #f5c18c;
 $info-color:      #eecb91;
 
 // OpenFarm Colors

diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
@@ -15,14 +15,14 @@ def destroy
   def after_sign_up_path_for(resource)
     # stored resource gets cleared after it gets called apparently
     go_to = stored_location_for(resource)
-    if (!resource.confirmed?)
+    if !resource.confirmed?
       resource.send_confirmation_instructions
     end
     if go_to
       go_to || request.referer || root_path
     else
       url_for(controller: 'users',
-        action: 'finish')
+              action: 'finish')
     end
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -67,6 +67,7 @@ def user_setting
   end
 
   protected
+
   def confirmation_required?
     false
   end

diff --git a/spec/features/user_sessions_spec.rb b/spec/features/user_sessions_spec.rb
@@ -42,14 +42,15 @@
   end
 
   it 'should redirect the user to the page they were viewing after sign up' do
-    visit "/guides/new"
-    see ("You need to sign in or sign up before continuing.")
+    visit '/guides/new'
+    see ('You need to sign in or sign up before continuing.')
     page.first(:link, 'Become a Member').click
     fill_in :user_display_name, with: 'Rick'
     fill_in :user_password, with: 'password123'
     fill_in :user_email, with: '[email protected]'
     click_button 'Join OpenFarm'
-    expect(page).to have_content(I18n::t('guides.new.new_guide_steps.create_a_growing_guide'))
+    string_ref = 'guides.new.new_guide_steps.create_a_growing_guide'
+    expect(page).to have_content(I18n::t(string_ref))
   end
 
   it 'should create a new garden for a newly registered user' do