consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing conflicts [#6]

Browse Source
This commit is contained in:
rgarcia
2015-07-16 20:14:18 +02:00
parent 1d17d1d1f7 24fb2765b9
commit e88832b5a3
10 changed files with 1545 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@@ -32,6 +32,8 @@ gem 'devise'
# Use Capistrano for deployment # Use Capistrano for deployment
# gem 'capistrano-rails', group: :development # gem 'capistrano-rails', group: :development
gem 'foundation-rails'
group :development, :test do group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console # Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug' gem 'byebug'
@@ -42,5 +44,6 @@ group :development, :test do
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring' gem 'spring'
gem 'rspec-rails', '~> 3.0' gem 'rspec-rails', '~> 3.0'
gem 'capybara'
end end

13
Gemfile.lock
View File

@@ -43,6 +43,12 @@ GEM
builder (3.2.2) builder (3.2.2)
byebug (5.0.0) byebug (5.0.0)
columnize (= 0.9.0) columnize (= 0.9.0)
capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
coffee-rails (4.1.0) coffee-rails (4.1.0)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
@@ -62,6 +68,9 @@ GEM
diff-lcs (1.2.5) diff-lcs (1.2.5)
erubis (2.7.0) erubis (2.7.0)
execjs (2.5.2) execjs (2.5.2)
foundation-rails (5.5.2.1)
railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5)
globalid (0.3.5) globalid (0.3.5)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
i18n (0.7.0) i18n (0.7.0)
@@ -167,14 +176,18 @@ GEM
binding_of_caller (>= 0.7.2) binding_of_caller (>= 0.7.2)
railties (>= 4.0) railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0) sprockets-rails (>= 2.0, < 4.0)
xpath (2.0.0)
nokogiri (~> 1.3)
PLATFORMS PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
byebug byebug
capybara
coffee-rails (~> 4.1.0) coffee-rails (~> 4.1.0)
devise devise
foundation-rails
jbuilder (~> 2.0) jbuilder (~> 2.0)
jquery-rails jquery-rails
rails (= 4.2.3) rails (= 4.2.3)

3
app/assets/javascripts/application.js
View File

@@ -12,5 +12,8 @@
// //
//= require jquery //= require jquery
//= require jquery_ujs //= require jquery_ujs
//= require foundation
//= require turbolinks //= require turbolinks
//= require_tree . //= require_tree .
$(function(){ $(document).foundation(); });

2
app/assets/stylesheets/application.css
View File

@@ -12,4 +12,6 @@
* *
*= require_tree . *= require_tree .
*= require_self *= require_self
*= require foundation_and_overrides
*/ */

1488
app/assets/stylesheets/foundation_and_overrides.scss Normal file
View File

File diff suppressed because it is too large Load Diff

6
app/controllers/welcome_controller.rb Normal file
View File

@@ -0,0 +1,6 @@
class WelcomeController < ApplicationController
def index
end
end

14
app/views/layouts/application.html.erb
View File

@@ -1,15 +1,19 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html lang="es">
<head> <head>
<title>Participacion</title> <meta charset="utf-8" />
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
<title><%= content_for?(:title) ? yield(:title) : "foundation-rails" %></title>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "vendor/modernizr" %>
<%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
</head> </head>
<body> <body>
<p class="alert"><%= notice %></p> <p class="alert"><%= notice %></p>
<p class="alert"><%= alert %></p> <p class="alert"><%= alert %></p>
<%= yield %> <%= yield %>
</body> </body>
</html> </html>

1
app/views/welcome/index.html.erb Normal file
View File

@@ -0,0 +1 @@
<h1>Bienvenido al Ayuntamiento de Madrid</h1>

10
spec/features/home_spec.rb Normal file
View File

@@ -0,0 +1,10 @@
require 'rails_helper'
feature "Home" do
scenario "Welcome message" do
visit '/'
expect(page).to have_content 'Bienvenido al Ayuntamiento de Madrid'
end
end

2
spec/rails_helper.rb
View File

@@ -4,6 +4,8 @@ abort("The Rails environment is running in production mode!") if Rails.env.produ
require 'spec_helper' require 'spec_helper'
require 'rspec/rails' require 'rspec/rails'
require 'capybara/rails'
require 'capybara/rspec'
ActiveRecord::Migration.maintain_test_schema! ActiveRecord::Migration.maintain_test_schema!
RSpec.configure do |config| RSpec.configure do |config|