ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

get forked-selenium specs working again 

* we no longer have a test environment in domain.yml i guess,
   which broke this
 * logging users in just by default assumed no forked server

testplan: n/a

Change-Id: I3c57aac6a1a1cf3164f1d9bc2b177a9d91162776
Reviewed-on: https://gerrit.instructure.com/6633
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
This commit is contained in:
JT Olds 2011-11-02 11:15:39 -06:00
parent cf29385018
commit cf6a996bec
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spec/selenium/common.rb
View File

@ -129,6 +129,7 @@ module SeleniumTestsHelperMethods
domain_conf_path = File.expand_path(File.dirname(__FILE__) + '/../../config/domain.yml')
domain_conf = YAML.load_file(domain_conf_path)
domain_conf[Rails.env] ||= {}
old_domain = domain_conf[Rails.env]["domain"]
domain_conf[Rails.env]["domain"] = $app_host_and_port
File.open(domain_conf_path, 'w') { |f| YAML.dump(domain_conf, f) }
@ -205,7 +206,7 @@ shared_examples_for "all selenium tests" do
def user_logged_in(opts={})
user_with_pseudonym({:active_user => true}.merge(opts))
create_session(@pseudonym, opts[:real_login])
create_session(@pseudonym, opts[:real_login] || $in_proc_webserver_shutdown.nil?)
end
def course_with_teacher_logged_in(opts={})