Permalink
Browse files

Merge branch 'master' into error_notice

  • Loading branch information...
muradin007@gmail.com muradin007@gmail.com
muradin007@gmail.com authored and muradin007@gmail.com committed Dec 19, 2011
2 parents 2a1ffd2 + 118e26d commit 5a635f0164c1ebc35a80d5f41484f7275893438c
@@ -7,8 +7,8 @@ def index
def feedback
user = current_user
user = {"login" => "anonymous", "email" => "anonymous"} if !user
- Emailer.deliver_feedback(user["login"], user["email"], params["subject"], params["body"])
- flash[:notice] = "Email sent!"
+ Emailer.deliver_feedback(user["login"], user["email"], params["subject"], params["body"])
+ flash[:notice] = "Email sent!"
render :file => "/contact/index.html.erb", :layout => "application"
end
end
@@ -1,6 +1,7 @@
<h1> About muh site </h1><br />
<a href="/site_facts"> Little known site facts </a><br />
<br />
+<div id="about_site">
<p>
The gamer ryoudan started out with nothing more than inspiration for what
should be an easy, intuitive and fun experience for game records. Video games
@@ -29,7 +30,9 @@
aspect should come to light as well within the gamer ryoudan's community. In providing this I believe
we can all benefit from the advantages we have to offer each other.
</p>
+</div>
<br />
+<div id="about_author">
<h1> About the author </h1>
<br />
<p>
@@ -55,4 +58,5 @@
<p>
Thanks for visiting =D !!!
</p>
+</div>
<br />
@@ -1,4 +1,4 @@
-<li class="orange li">
+<li class="pale_orange li">
<p><%= link_to("Recent changes", {:controller => "recent_changes"}, {:class =>"white_link"})%></p>
METAAAL GEAAAAAAAR!
-</li>
+</li>
View
@@ -5,7 +5,7 @@
# ENV['RAILS_ENV'] ||= 'production'
# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')
@@ -77,4 +77,4 @@
end
require 'will_paginate'
-require 'paginationlistlinkrenderer.rb'
+require 'paginationlistlinkrenderer.rb'
@@ -13,4 +13,4 @@
config.action_view.debug_rjs = true
config.action_controller.perform_caching = false
-config.action_mailer.raise_delivery_errors = true
+config.action_mailer.raise_delivery_errors = false
@@ -4,7 +4,7 @@
# test suite. You never need to work with it otherwise. Remember that
# your test database is "scratch space" for the test suite and is wiped
# and recreated between test runs. Don't rely on the data there!
-config.cache_classes = true
+config.cache_classes = false
# Log error messages when you accidentally call methods on nil.
config.whiny_nils = true
View
@@ -1,5 +0,0 @@
-To build the guides:
-
-* Install source-highlighter (http://www.gnu.org/software/src-highlite/source-highlight.html)
-* Install the mizuho gem (http://github.com/FooBarWidget/mizuho/tree/master)
-* Run `rake guides` from the railties directory
View
View
@@ -1,12 +1,37 @@
-mysql libs
-ruby mysql libs
-libreadline6-dev
-libmagickwand-dev
-curl
-git
-rvm
-ruby 1.8.7
-rails 2.2.3
-cd ~/.rvm/src/rubyXXXX/ext/openssl;ruby extconf.rb;make;make install
+note: this list was made from a bare installation of ubuntu linux
+*Install/execute in the order listed*
+apps/libraries
+--------------
+Git - Ubuntu Software Center
+Curl - Ubuntu Software Center
+MySQL Administrator - Ubuntu Software Center
+RVM - bash < <(curl -s https://rvm.beginrescueend.com/install/rvm)
+libmysqlclient16-dev - Synaptic
+libmysql-ruby - Synaptic
+libreadline6-dev - Synaptic
+libmagickwand-dev - Synaptic
+libssl-dev - Synaptic
+
+rvm and ruby setup*
+-------------------
+rvm install ruby-1.8.7
+cd ~/.rvm/src/ruby-1.8.7-p352/ext/openssl;ruby extconf.rb;make;make install
+
+gem setup**
+----------
+gem install rails -v 2.3.8
+gem install mysql -v 2.8.1
+gem install authlogic -v 2.1.6
+gem install rmagick -v 2.13.1
+gem install ruby-github -v 0.0.3
+gem install aws-s3 -v 0.6.2
+gem install will_paginate -v 2.3.16
+
+*RVM - don't forget to add [[ -s "/home/mars/.rvm/scripts/rvm" ]] && source "/home/mars/.rvm/scripts/rvm" to your .bashrc if you want rvm loaded into every shell you bring up
+ - You may have to (or want to) add "rvm ruby-1.8.7" to your .bashrc too.
+
+*That "cd ~/.rvm" command was made for ruby-1.8.7-p352, your version installed from rvm may be different or you may want it to be different. If it is, change the command accordingly
+
+**Lots of No definition for XYZ will show up during mysql and rmagick gem installs, this is normal.
@@ -519,6 +519,7 @@ p {
.red_purple {background:#C60B1D;}
.red{background:#E90000;}
.orange{background:#FF4100;}
+.pale_orange{background:#FF7900;}
.light_orange{background:#FF6600;}
.orange_yellow{background:#FF9000;}
@@ -867,4 +868,4 @@ button.positive, .buttons a.positive{
.notes_row {
max-width:147px;
text-align:center;
-}
+}
@@ -1,7 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-# one:
-# column: value
-#
-# two:
-# column: value
@@ -1,7 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-# one:
-# column: value
-#
-# two:
-# column: value
@@ -1,7 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-# one:
-# column: value
-#
-# two:
-# column: value
@@ -1,7 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-# one:
-# column: value
-#
-# two:
-# column: value
@@ -1,7 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-# one:
-# column: value
-#
-# two:
-# column: value
@@ -1,7 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-# one:
-# column: value
-#
-# two:
-# column: value
@@ -1,7 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-# one:
-# column: value
-#
-# two:
-# column: value
@@ -1,7 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-# one:
-# column: value
-#
-# two:
-# column: value
@@ -1,7 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-# one:
-# column: value
-#
-# two:
-# column: value
@@ -1,7 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-# one:
-# column: value
-#
-# two:
-# column: value
View
@@ -1,8 +1,10 @@
require 'test_helper'
+require 'mocha'
-class AboutControllerTest < ActionController::TestCase
- # Replace this with your real tests.
- test "the truth" do
- assert true
- end
+class AboutControllerTest < ActionController::TestCase
+
+ test 'index_loads_properly' do
+ get :index
+ assert_response :success
+ end
end
View
@@ -1,8 +1,31 @@
require 'test_helper'
+require "authlogic/test_case"
+
class ContactControllerTest < ActionController::TestCase
- # Replace this with your real tests.
- test "the truth" do
- assert true
- end
+
+ setup :activate_authlogic
+
+ test 'index_should_load_properly' do
+ get :index
+ delete flash[:notice] if flash[:notice]
+ assert_nil flash[:notice]
+ assert_response :success
+ end
+
+ test 'email feedback can be sent when logged in' do
+ num_deliveries = ActionMailer::Base.deliveries.size
+ u = User.create({"login" => "login1", "password"=>"123456", "password_confirmation"=>"123456", "email" => "1@1.aol.com"})
+ post :feedback
+ assert_not_nil assigns["current_user"]
+ assert_equal flash[:notice], "Email sent!"
+ assert_equal num_deliveries+1, ActionMailer::Base.deliveries.size
+ end
+
+ test 'email feedback can be sent when not logged in' do
+ num_deliveries = ActionMailer::Base.deliveries.size
+ post :feedback
+ assert_equal flash[:notice], "Email sent!"
+ assert_equal num_deliveries+1, ActionMailer::Base.deliveries.size
+ end
end
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
2 test/test_helper.rb 100755 → 100644
@@ -2,7 +2,7 @@
require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
require 'test_help'
-class Test::Unit::TestCase
+class ActiveSupport::TestCase
# Transactional fixtures accelerate your tests by wrapping each test method
# in a transaction that's rolled back on completion. This ensures that the
# test database remains unchanged so your fixtures don't have to be reloaded

0 comments on commit 5a635f0

Please sign in to comment.