Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixing assets test

  • Loading branch information...
commit b435a7cc673248987b720c30657fe2281a9d95a9 1 parent f6836d8
@tscolari tscolari authored
Showing with 43 additions and 14 deletions.
  1. +0 −2  features/step_definitions/assets_step.rb
  2. 0  tmp/aruba/{test_app3 → test_app19}/.gitignore
  3. 0  tmp/aruba/{test_app3 → test_app19}/Gemfile
  4. 0  tmp/aruba/{test_app3 → test_app19}/README
  5. +1 −1  tmp/aruba/{test_app3 → test_app19}/Rakefile
  6. 0  tmp/aruba/{test_app3 → test_app19}/app/assets/images/rails.png
  7. 0  tmp/aruba/{test_app3 → test_app19}/app/assets/javascripts/application.js
  8. 0  tmp/aruba/{test_app3 → test_app19}/app/assets/stylesheets/application.css
  9. 0  tmp/aruba/{test_app3 → test_app19}/app/controllers/application_controller.rb
  10. 0  tmp/aruba/{test_app3 → test_app19}/app/helpers/application_helper.rb
  11. 0  tmp/aruba/{test_app3/vendor/plugins → test_app19/app/mailers}/.gitkeep
  12. 0  tmp/aruba/{test_app3/vendor/assets/stylesheets → test_app19/app/models}/.gitkeep
  13. +13 −0 tmp/aruba/test_app19/app/views/homes/_sidebar.html.erb
  14. +18 −0 tmp/aruba/test_app19/app/views/homes/show.html.erb
  15. +1 −1  tmp/aruba/{test_app3 → test_app19}/app/views/layouts/application.html.erb
  16. +1 −1  tmp/aruba/{test_app3 → test_app19}/config.ru
  17. +1 −1  tmp/aruba/{test_app3 → test_app19}/config/application.rb
  18. 0  tmp/aruba/{test_app3 → test_app19}/config/boot.rb
  19. 0  tmp/aruba/{test_app3 → test_app19}/config/database.yml
  20. +1 −1  tmp/aruba/{test_app3 → test_app19}/config/environment.rb
  21. +1 −1  tmp/aruba/{test_app3 → test_app19}/config/environments/development.rb
  22. +1 −1  tmp/aruba/{test_app3 → test_app19}/config/environments/production.rb
  23. +1 −1  tmp/aruba/{test_app3 → test_app19}/config/environments/test.rb
  24. 0  tmp/aruba/{test_app3 → test_app19}/config/initializers/backtrace_silencers.rb
  25. 0  tmp/aruba/{test_app3 → test_app19}/config/initializers/inflections.rb
  26. 0  tmp/aruba/{test_app3 → test_app19}/config/initializers/mime_types.rb
  27. +1 −1  tmp/aruba/{test_app3 → test_app19}/config/initializers/secret_token.rb
  28. +2 −2 tmp/aruba/{test_app3 → test_app19}/config/initializers/session_store.rb
  29. 0  tmp/aruba/{test_app3 → test_app19}/config/initializers/wrap_parameters.rb
  30. 0  tmp/aruba/{test_app3 → test_app19}/config/locales/en.yml
  31. +1 −1  tmp/aruba/{test_app3 → test_app19}/config/routes.rb
  32. 0  tmp/aruba/{test_app3 → test_app19}/db/seeds.rb
  33. 0  tmp/aruba/{test_app3 → test_app19}/doc/README_FOR_APP
  34. 0  tmp/aruba/{test_app3/test/unit → test_app19/lib/assets}/.gitkeep
  35. 0  tmp/aruba/{test_app3/test/integration → test_app19/lib/tasks}/.gitkeep
  36. 0  tmp/aruba/{test_app3/test/functional → test_app19/log}/.gitkeep
  37. 0  tmp/aruba/{test_app3 → test_app19}/public/404.html
  38. 0  tmp/aruba/{test_app3 → test_app19}/public/422.html
  39. 0  tmp/aruba/{test_app3 → test_app19}/public/500.html
  40. 0  tmp/aruba/{test_app3 → test_app19}/public/favicon.ico
  41. 0  tmp/aruba/{test_app3 → test_app19}/public/index.html
  42. 0  tmp/aruba/{test_app3 → test_app19}/public/robots.txt
  43. 0  tmp/aruba/{test_app3 → test_app19}/script/rails
  44. 0  tmp/aruba/{test_app3 → test_app19}/test/fixtures/.gitkeep
  45. 0  tmp/aruba/{test_app3/log → test_app19/test/functional}/.gitkeep
  46. 0  tmp/aruba/{test_app3/lib/tasks → test_app19/test/integration}/.gitkeep
  47. 0  tmp/aruba/{test_app3 → test_app19}/test/performance/browsing_test.rb
  48. 0  tmp/aruba/{test_app3 → test_app19}/test/test_helper.rb
  49. 0  tmp/aruba/{test_app3/lib/assets → test_app19/test/unit}/.gitkeep
  50. 0  tmp/aruba/{test_app3/app/models → test_app19/vendor/assets/stylesheets}/.gitkeep
  51. 0  tmp/aruba/{test_app3/app/mailers → test_app19/vendor/plugins}/.gitkeep
View
2  features/step_definitions/assets_step.rb
@@ -1,13 +1,11 @@
Given /^I generate assets$/ do
steps %Q{
And I run `rails generate web_app_theme:assets`
- And I wait "5" seconds
}
end
Given /^I generate assets choosing the "([^\"]*)" theme$/ do |theme_name|
steps %Q{
And I run `rails generate web_app_theme:assets --theme=#{theme_name}`
- And I wait "5" seconds
}
end
View
0  tmp/aruba/test_app3/.gitignore → tmp/aruba/test_app19/.gitignore
File renamed without changes
View
0  tmp/aruba/test_app3/Gemfile → tmp/aruba/test_app19/Gemfile
File renamed without changes
View
0  tmp/aruba/test_app3/README → tmp/aruba/test_app19/README
File renamed without changes
View
2  tmp/aruba/test_app3/Rakefile → tmp/aruba/test_app19/Rakefile
@@ -4,4 +4,4 @@
require File.expand_path('../config/application', __FILE__)
-TestApp3::Application.load_tasks
+TestApp19::Application.load_tasks
View
0  ...uba/test_app3/app/assets/images/rails.png → ...ba/test_app19/app/assets/images/rails.png
File renamed without changes
View
0  ...pp3/app/assets/javascripts/application.js → ...p19/app/assets/javascripts/application.js
File renamed without changes
View
0  ...p3/app/assets/stylesheets/application.css → ...19/app/assets/stylesheets/application.css
File renamed without changes
View
0  ...app/controllers/application_controller.rb → ...app/controllers/application_controller.rb
File renamed without changes
View
0  ...st_app3/app/helpers/application_helper.rb → ...t_app19/app/helpers/application_helper.rb
File renamed without changes
View
0  tmp/aruba/test_app3/vendor/plugins/.gitkeep → tmp/aruba/test_app19/app/mailers/.gitkeep
File renamed without changes
View
0  ...t_app3/vendor/assets/stylesheets/.gitkeep → tmp/aruba/test_app19/app/models/.gitkeep
File renamed without changes
View
13 tmp/aruba/test_app19/app/views/homes/_sidebar.html.erb
@@ -0,0 +1,13 @@
+<div class="block notice">
+ <h3>Simple Block</h3>
+ <div class="content">
+ <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+ </div>
+</div>
+<div class="block">
+ <h3>Links</h3>
+ <ul class="navigation">
+ <li><a href="#">Link 1</a></li>
+ <li><a href="#">Link 2</a></li>
+ </ul>
+</div>
View
18 tmp/aruba/test_app19/app/views/homes/show.html.erb
@@ -0,0 +1,18 @@
+<div class="block" id="block-text">
+ <div class="content">
+ <h2 class="title">Home</h2>
+ <div class="inner">
+ <p class="first">
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. <span class="hightlight">Excepteur sint occaecat cupidatat non proident</span>, sunt in culpa qui officia deserunt mollit anim id est laborum.
+ </p>
+ <p> <span class="small">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore</span></p>
+ <p> <span class="gray">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore</span></p>
+ <hr />
+ <p>
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. <span class="hightlight">Excepteur sint occaecat cupidatat non proident</span>, sunt in culpa qui officia deserunt mollit anim id est laborum.
+ </p>
+ </div>
+ </div>
+</div>
+
+<% content_for :sidebar, render(:partial => 'sidebar') -%>
View
2  ...p3/app/views/layouts/application.html.erb → ...19/app/views/layouts/application.html.erb
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>TestApp3</title>
+ <title>TestApp19</title>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "application" %>
<%= csrf_meta_tags %>
View
2  tmp/aruba/test_app3/config.ru → tmp/aruba/test_app19/config.ru
@@ -1,4 +1,4 @@
# This file is used by Rack-based servers to start the application.
require ::File.expand_path('../config/environment', __FILE__)
-run TestApp3::Application
+run TestApp19::Application
View
2  tmp/aruba/test_app3/config/application.rb → tmp/aruba/test_app19/config/application.rb
@@ -9,7 +9,7 @@
# Bundler.require(:default, :assets, Rails.env)
end
-module TestApp3
+module TestApp19
class Application < Rails::Application
# Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers
View
0  tmp/aruba/test_app3/config/boot.rb → tmp/aruba/test_app19/config/boot.rb
File renamed without changes
View
0  tmp/aruba/test_app3/config/database.yml → tmp/aruba/test_app19/config/database.yml
File renamed without changes
View
2  tmp/aruba/test_app3/config/environment.rb → tmp/aruba/test_app19/config/environment.rb
@@ -2,4 +2,4 @@
require File.expand_path('../application', __FILE__)
# Initialize the rails application
-TestApp3::Application.initialize!
+TestApp19::Application.initialize!
View
2  ...t_app3/config/environments/development.rb → ..._app19/config/environments/development.rb
@@ -1,4 +1,4 @@
-TestApp3::Application.configure do
+TestApp19::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
# In the development environment your application's code is reloaded on
View
2  ...st_app3/config/environments/production.rb → ...t_app19/config/environments/production.rb
@@ -1,4 +1,4 @@
-TestApp3::Application.configure do
+TestApp19::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
# Code is not reloaded between requests
View
2  ...uba/test_app3/config/environments/test.rb → ...ba/test_app19/config/environments/test.rb
@@ -1,4 +1,4 @@
-TestApp3::Application.configure do
+TestApp19::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
# The test environment is used exclusively to run your application's
View
0  ...onfig/initializers/backtrace_silencers.rb → ...onfig/initializers/backtrace_silencers.rb
File renamed without changes
View
0  ...t_app3/config/initializers/inflections.rb → ..._app19/config/initializers/inflections.rb
File renamed without changes
View
0  ...st_app3/config/initializers/mime_types.rb → ...t_app19/config/initializers/mime_types.rb
File renamed without changes
View
2  ..._app3/config/initializers/secret_token.rb → ...app19/config/initializers/secret_token.rb
@@ -4,4 +4,4 @@
# If you change this key, all old signed cookies will become invalid!
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
-TestApp3::Application.config.secret_token = '2e893acd7f751b8be2e497b93673d83fd297b439947b8cca9dd893ee814e72dc839d0e2105acd58331668cd8c7dbd168147d69e5485865271851bd2fd151590d'
+TestApp19::Application.config.secret_token = '91758e5f7910510ec13bc7f94c364dc62a5d46ac9e9cba8d512eabb0fefcd396ae77a145b45ca459b24f25d138d737246762af0e269955c6058a4e99359e539f'
View
4 ...app3/config/initializers/session_store.rb → ...pp19/config/initializers/session_store.rb
@@ -1,8 +1,8 @@
# Be sure to restart your server when you modify this file.
-TestApp3::Application.config.session_store :cookie_store, key: '_test_app3_session'
+TestApp19::Application.config.session_store :cookie_store, key: '_test_app19_session'
# Use the database for sessions instead of the cookie-based default,
# which shouldn't be used to store highly confidential information
# (create the session table with "rails generate session_migration")
-# TestApp3::Application.config.session_store :active_record_store
+# TestApp19::Application.config.session_store :active_record_store
View
0  ...p3/config/initializers/wrap_parameters.rb → ...19/config/initializers/wrap_parameters.rb
File renamed without changes
View
0  tmp/aruba/test_app3/config/locales/en.yml → tmp/aruba/test_app19/config/locales/en.yml
File renamed without changes
View
2  tmp/aruba/test_app3/config/routes.rb → tmp/aruba/test_app19/config/routes.rb
@@ -1,4 +1,4 @@
-TestApp3::Application.routes.draw do
+TestApp19::Application.routes.draw do
# The priority is based upon order of creation:
# first created -> highest priority.
View
0  tmp/aruba/test_app3/db/seeds.rb → tmp/aruba/test_app19/db/seeds.rb
File renamed without changes
View
0  tmp/aruba/test_app3/doc/README_FOR_APP → tmp/aruba/test_app19/doc/README_FOR_APP
File renamed without changes
View
0  tmp/aruba/test_app3/test/unit/.gitkeep → tmp/aruba/test_app19/lib/assets/.gitkeep
File renamed without changes
View
0  ...aruba/test_app3/test/integration/.gitkeep → tmp/aruba/test_app19/lib/tasks/.gitkeep
File renamed without changes
View
0  tmp/aruba/test_app3/test/functional/.gitkeep → tmp/aruba/test_app19/log/.gitkeep
File renamed without changes
View
0  tmp/aruba/test_app3/public/404.html → tmp/aruba/test_app19/public/404.html
File renamed without changes
View
0  tmp/aruba/test_app3/public/422.html → tmp/aruba/test_app19/public/422.html
File renamed without changes
View
0  tmp/aruba/test_app3/public/500.html → tmp/aruba/test_app19/public/500.html
File renamed without changes
View
0  tmp/aruba/test_app3/public/favicon.ico → tmp/aruba/test_app19/public/favicon.ico
File renamed without changes
View
0  tmp/aruba/test_app3/public/index.html → tmp/aruba/test_app19/public/index.html
File renamed without changes
View
0  tmp/aruba/test_app3/public/robots.txt → tmp/aruba/test_app19/public/robots.txt
File renamed without changes
View
0  tmp/aruba/test_app3/script/rails → tmp/aruba/test_app19/script/rails
File renamed without changes
View
0  tmp/aruba/test_app3/test/fixtures/.gitkeep → tmp/aruba/test_app19/test/fixtures/.gitkeep
File renamed without changes
View
0  tmp/aruba/test_app3/log/.gitkeep → ...aruba/test_app19/test/functional/.gitkeep
File renamed without changes
View
0  tmp/aruba/test_app3/lib/tasks/.gitkeep → ...ruba/test_app19/test/integration/.gitkeep
File renamed without changes
View
0  ...st_app3/test/performance/browsing_test.rb → ...t_app19/test/performance/browsing_test.rb
File renamed without changes
View
0  tmp/aruba/test_app3/test/test_helper.rb → tmp/aruba/test_app19/test/test_helper.rb
File renamed without changes
View
0  tmp/aruba/test_app3/lib/assets/.gitkeep → tmp/aruba/test_app19/test/unit/.gitkeep
File renamed without changes
View
0  tmp/aruba/test_app3/app/models/.gitkeep → ..._app19/vendor/assets/stylesheets/.gitkeep
File renamed without changes
View
0  tmp/aruba/test_app3/app/mailers/.gitkeep → tmp/aruba/test_app19/vendor/plugins/.gitkeep
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.