Skip to content

Commit

Permalink
mailconf: do not depend on fixture data (fix random failures)
Browse files Browse the repository at this point in the history
  • Loading branch information
brauliobo committed Mar 12, 2016
1 parent ccc53a3 commit 5386b39
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions test/functional/mailconf_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,21 @@ def setup
env = Environment.default
env.force_www = true
env.save!
env.domains.delete_all
env.domains.create! name: 'example.com'
get :index, :profile => 'ze'
assert_tag :tag => 'li', :content => /ze@colivre.net/
assert_tag :tag => 'li', :content => /ze@example.com/
end

should 'not display www in email address when force_www=false' do
login_as('ze')
env = Environment.default
env.force_www = false
env.save!
env.domains.delete_all
env.domains.create! name: 'example.com'
get :index, :profile => 'ze'
assert_tag :tag => 'li', :content => /ze@colivre.net/
assert_tag :tag => 'li', :content => /ze@example.com/
end

should 'create task to environment admin when enable email' do
Expand Down

0 comments on commit 5386b39

Please sign in to comment.