Skip to content

Commit

Permalink
Updated test app. Cleaned up javascript
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbasdf
jbasdf committed Mar 19, 2011
1 parent 41fe1b1 commit 3d79e9e
Show file tree
Hide file tree
Showing 7 changed files with 102 additions and 338 deletions.
2 changes: 1 addition & 1 deletion app/controllers/muck/authentications_controller.rb
View file
Expand Up @@ -30,7 +30,7 @@ def create
if @user.save
UserSession.create(@user)
flash[:notice] = t('muck.users.thanks_sign_up')
status = :new_signup_success
status = :new_signup_success
else
# Have to build a new user to get rid of the password
@user = User.new
Expand Down
3 changes: 2 additions & 1 deletion test/Gemfile
View file
@@ -1,13 +1,14 @@
source "http://rubygems.org"

gem "rails", "3.0.4"
gem "rails", "3.0.5"
gem 'mysql'

# gem 'authlogic'
gem 'authlogic', :git => 'git://github.com/binarylogic/authlogic.git'

gem "will_paginate", "~> 3.0.pre2"
gem "bcrypt-ruby", :require => "bcrypt"
gem "jammit"

gem "muck-engine" #, :path => "~/projects/muck-engine"
gem "muck-users", ">=3.1.11" #, :path => "~/projects/muck-users"
Expand Down
118 changes: 65 additions & 53 deletions test/Gemfile.lock
View file
Expand Up @@ -8,7 +8,7 @@ GIT
PATH
remote: ../
specs:
muck-auth (3.3.3)
muck-auth (3.4.0)
muck-engine
muck-users
omniauth
Expand Down Expand Up @@ -37,32 +37,32 @@ GEM
specs:
ZenTest (4.5.0)
abstract (1.0.0)
actionmailer (3.0.4)
actionpack (= 3.0.4)
actionmailer (3.0.5)
actionpack (= 3.0.5)
mail (~> 2.2.15)
actionpack (3.0.4)
activemodel (= 3.0.4)
activesupport (= 3.0.4)
actionpack (3.0.5)
activemodel (= 3.0.5)
activesupport (= 3.0.5)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.4)
rack (~> 1.2.1)
rack-mount (~> 0.6.13)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
activemodel (3.0.4)
activesupport (= 3.0.4)
activemodel (3.0.5)
activesupport (= 3.0.5)
builder (~> 2.1.2)
i18n (~> 0.4)
activerecord (3.0.4)
activemodel (= 3.0.4)
activesupport (= 3.0.4)
activerecord (3.0.5)
activemodel (= 3.0.5)
activesupport (= 3.0.5)
arel (~> 2.0.2)
tzinfo (~> 0.3.23)
activeresource (3.0.4)
activemodel (= 3.0.4)
activesupport (= 3.0.4)
activesupport (3.0.4)
activeresource (3.0.5)
activemodel (= 3.0.5)
activesupport (= 3.0.5)
activesupport (3.0.5)
acts-as-taggable-on (2.0.6)
addressable (2.2.4)
arel (2.0.9)
Expand All @@ -74,7 +74,7 @@ GEM
builder
mime-types
xml-simple
babelphish (0.3.0)
babelphish (0.4.1)
json
ya2yaml
babosa (0.2.2)
Expand All @@ -92,6 +92,7 @@ GEM
celerity (0.8.8)
childprocess (0.1.7)
ffi (~> 0.6.3)
closure-compiler (1.0.0)
columnize (0.3.2)
configuration (1.2.0)
crack (0.1.8)
Expand All @@ -104,16 +105,16 @@ GEM
cucumber-rails (0.3.2)
cucumber (>= 0.8.0)
culerity (0.2.15)
curb (0.7.12)
database_cleaner (0.6.4)
curb (0.7.14)
database_cleaner (0.6.6)
diff-lcs (1.1.2)
erubis (2.6.6)
abstract (>= 1.0.0)
factory_girl (1.3.3)
faraday (0.5.7)
addressable (~> 2.2.4)
multipart-post (~> 1.1.0)
rack (>= 1.1.0, < 2)
rack (< 2, >= 1.1.0)
feedzirra (0.0.24)
activesupport (>= 2.3.8)
builder (>= 2.1.2)
Expand All @@ -126,12 +127,15 @@ GEM
friendly_id (3.2.1)
babosa (~> 0.2.1)
geokit (1.5.0)
gherkin (2.3.3)
gherkin (2.3.4)
json (~> 1.4.6)
hpricot (0.8.4)
httparty (0.7.4)
crack (= 0.1.8)
i18n (0.5.0)
jammit (0.6.0)
closure-compiler (>= 0.1.0)
yui-compressor (>= 0.9.1)
json (1.4.6)
json_pure (1.5.1)
launchy (0.4.0)
Expand All @@ -155,18 +159,19 @@ GEM
muck-users
nested_set
sanitize
muck-contents (3.1.3)
muck-contents (3.1.4)
acts-as-taggable-on
awesome_nested_set
babelphish
friendly_id (>= 3.2.0)
muck-comments
muck-engine
muck-users
nested_set
sanitize
tiny_mce
uploader
muck-engine (3.2.6)
muck-engine (3.2.10)
overlord
validation_reflection
will_paginate (~> 3.0.pre2)
Expand All @@ -190,7 +195,7 @@ GEM
muck-engine
muck-users
muck-solr (3.0.1)
muck-users (3.1.11)
muck-users (3.1.26)
authlogic
bcrypt-ruby
friendly_id
Expand All @@ -203,39 +208,44 @@ GEM
railties (>= 3.0.0)
net-ldap (0.1.1)
nokogiri (1.4.4)
oa-basic (0.1.6)
oa-basic (0.2.0)
multi_json (~> 0.0.2)
nokogiri (~> 1.4.2)
oa-core (= 0.1.6)
oa-core (= 0.2.0)
rest-client (~> 1.6.0)
oa-core (0.1.6)
oa-core (0.2.0)
rack (~> 1.1)
oa-enterprise (0.1.6)
oa-enterprise (0.2.0)
net-ldap (~> 0.1.1)
nokogiri (~> 1.4.2)
oa-core (= 0.1.6)
oa-core (= 0.2.0)
pyu-ruby-sasl (~> 0.0.3.1)
rubyntlm (~> 0.1.1)
oa-oauth (0.1.6)
oa-more (0.2.0)
multi_json (~> 0.0.2)
oa-core (= 0.2.0)
rest-client (~> 1.6.0)
oa-oauth (0.2.0)
multi_json (~> 0.0.2)
nokogiri (~> 1.4.2)
oa-core (= 0.1.6)
oa-core (= 0.2.0)
oauth (~> 0.4.0)
oauth2 (~> 0.1.0)
oa-openid (0.1.6)
oa-core (= 0.1.6)
oauth2 (~> 0.1.1)
oa-openid (0.2.0)
oa-core (= 0.2.0)
rack-openid (~> 1.2.0)
ruby-openid-apps-discovery
oauth (0.4.4)
oauth2 (0.1.1)
faraday (~> 0.5.0)
multi_json (~> 0.0.4)
omniauth (0.1.6)
oa-basic (= 0.1.6)
oa-core (= 0.1.6)
oa-enterprise (= 0.1.6)
oa-oauth (= 0.1.6)
oa-openid (= 0.1.6)
omniauth (0.2.0)
oa-basic (= 0.2.0)
oa-core (= 0.2.0)
oa-enterprise (= 0.2.0)
oa-more (= 0.2.0)
oa-oauth (= 0.2.0)
oa-openid (= 0.2.0)
overlord (3.0.2)
httparty
json
Expand All @@ -244,25 +254,25 @@ GEM
activesupport
polyglot (0.3.1)
pyu-ruby-sasl (0.0.3.2)
rack (1.2.1)
rack (1.2.2)
rack-mount (0.6.13)
rack (>= 1.0.0)
rack-openid (1.2.0)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
rack-test (0.5.7)
rack (>= 1.0)
rails (3.0.4)
actionmailer (= 3.0.4)
actionpack (= 3.0.4)
activerecord (= 3.0.4)
activeresource (= 3.0.4)
activesupport (= 3.0.4)
rails (3.0.5)
actionmailer (= 3.0.5)
actionpack (= 3.0.5)
activerecord (= 3.0.5)
activeresource (= 3.0.5)
activesupport (= 3.0.5)
bundler (~> 1.0)
railties (= 3.0.4)
railties (3.0.4)
actionpack (= 3.0.4)
activesupport (= 3.0.4)
railties (= 3.0.5)
railties (3.0.5)
actionpack (= 3.0.5)
activesupport (= 3.0.5)
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (0.8.7)
Expand Down Expand Up @@ -295,7 +305,7 @@ GEM
ruby-openid (>= 2.1.7)
rubyntlm (0.1.1)
rubyzip (0.9.4)
sanitize (2.0.0)
sanitize (2.0.1)
nokogiri (~> 1.4.4)
sax-machine (0.0.16)
nokogiri (> 0.0.0)
Expand All @@ -311,7 +321,7 @@ GEM
tiny_mce (0.1.4)
treetop (1.4.9)
polyglot (>= 0.3.1)
tzinfo (0.3.24)
tzinfo (0.3.25)
uploader (3.0.2)
aws-s3
mime-types
Expand All @@ -323,6 +333,7 @@ GEM
xpath (0.1.3)
nokogiri (~> 1.3)
ya2yaml (0.30)
yui-compressor (0.9.4)

PLATFORMS
ruby
Expand All @@ -336,6 +347,7 @@ DEPENDENCIES
cucumber-rails
database_cleaner
factory_girl
jammit
launchy
muck-auth!
muck-comments
Expand All @@ -345,7 +357,7 @@ DEPENDENCIES
muck-shares
muck-users (>= 3.1.11)
mysql
rails (= 3.0.4)
rails (= 3.0.5)
rcov
rspec
rspec-rails
Expand Down
2 changes: 0 additions & 2 deletions test/app/views/layouts/default.html.erb
View file
Expand Up @@ -12,9 +12,7 @@
</div>
</div>
</div>
<script type="text/javascript" language="JavaScript">
<%= yield :javascript %>
</script>
<%= render :partial => 'layouts/global/google_analytics' %>
</body>
</html>
34 changes: 34 additions & 0 deletions test/config/assets.yml
View file
@@ -0,0 +1,34 @@
allow_debugging: on

javascripts:
site:
- public/javascripts/jquery/jquery-1.5.1.js
- public/javascripts/jquery/jquery-ui-1.8.11.custom.js
- public/javascripts/jquery/jquery.form.js
- public/javascripts/jquery/jquery.tips.js
- public/javascripts/jquery/jquery.cookie.js
- public/javascripts/jquery/jquery.easing.js
- public/javascripts/jquery/jquery.fancybox.js
- public/javascripts/rails.js
- public/javascripts/muck.js
- public/javascripts/application.js
admin:
- public/javascripts/jquery/jquery-1.5.1.js
- public/javascripts/jquery/jquery-ui-1.8.11.custom.js
- public/javascripts/jquery/jquery.form.js
- public/javascripts/jquery/jquery.tips.js
- public/javascripts/jquery/jquery.cookie.js
- public/javascripts/jquery/jquery.easing.js
- public/javascripts/jquery/jquery.fancybox.js
- public/javascripts/rails.js
- public/javascripts/muck.js
- public/javascripts/muck_admin.js
stylesheets:
site:
- public/stylesheets/jquery/smoothness/jquery-ui-1.8.11.custom.css
- public/stylesheets/jquery/jquery.fancybox.css
- public/stylesheets/default.css
admin:
- public/stylesheets/jquery/smoothness/jquery-ui-1.8.11.custom.css
- public/stylesheets/jquery/jquery.fancybox.css
- public/stylesheets/admin.css

0 comments on commit 3d79e9e

Please sign in to comment.