Test fixes

Author: nygrenh

app/models/available_point.rb

@@ -81,12 +81,13 @@ def self.course_sheet_points_list(course, sheet)
   end
 
   def award_to(user, submission = nil)
+    point_awarded_at = submission ? submission.created_at : Time.zone.now
     AwardedPoint.create!(
       course_id: exercise.course_id,
       name: name,
       user_id: user.id,
       submission: submission,
-      created_at: submission.created_at
+      created_at: point_awarded_at
     )
   rescue ActiveRecord::RecordNotUnique
   end

bin/spec_controllers

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+RSPEC_PATTERN="spec/controllers/*.rb,spec/controllers/setup/*.rb"
+bundle exec rake spec SPEC_OPTS="--pattern $RSPEC_PATTERN --format documentation"

bin/spec_features

@@ -0,0 +1,3 @@
+#!/bin/sh
+RSPEC_PATTERN="spec/features/**/*.rb"
+bundle exec rake spec SPEC_OPTS="--pattern $RSPEC_PATTERN --format documentation"

bin/spec_integration

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+RSPEC_PATTERN="spec/integration/**/*.rb"
+bundle exec rake spec SPEC_OPTS="--pattern $RSPEC_PATTERN --format documentation"

bin/spec_lib

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+RSPEC_PATTERN="spec/lib/**/*.rb"
+bundle exec rake spec SPEC_OPTS="--pattern $RSPEC_PATTERN --format documentation"

bin/spec_models

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+RSPEC_PATTERN="spec/models/**/*.rb"
+bundle exec rake spec SPEC_OPTS="--pattern $RSPEC_PATTERN --format documentation"

spec/controllers/setup/organizations_controller_spec.rb

@@ -12,7 +12,7 @@
     {
       name: 'TestOrganization',
       slug: 'test-organization',
-      verified: true
+      verified: true,
     }
   end
 
@@ -28,7 +28,7 @@
     {
       name: 'New organization name',
       information: 'New information',
-      website: 'http://newurl.net/'
+      website: 'http://newurl.net/',
     }
   end
 

spec/spec_helper.rb

@@ -77,6 +77,7 @@ def host_ip
   config.before(:each) do |context|
     allow(Tailoring).to receive_messages(get: Tailoring.new)
     SiteSetting.use_distribution_defaults!
+    SiteSetting.all_settings['administrative_email'] = 'test@example.com'
 
     if context.metadata[:integration] || context.metadata[:feature]
       # integration tests can't use transaction since the webserver must see the changes

spec/support/integration_test_actions.rb

@@ -6,8 +6,9 @@ module IntegrationTestActions
   include SystemCommands
 
   def log_in_as(username, password)
-    fill_in 'session_login', with: username
-    fill_in 'session_password', with: password
+    visit 'login'
+    fill_in 'username', with: username
+    fill_in 'password', with: password
     click_button 'Sign in'
 
     expect(page).to have_content('Sign out')