From 65d4603093edfbcfa8aa9d27d47511f256460a53 Mon Sep 17 00:00:00 2001 From: momoko saunders Date: Fri, 18 Jul 2014 19:33:42 -0700 Subject: [PATCH] Merging again --- Gemfile.lock | 395 +++++++++++++++++++ config/database.yml | 13 +- config/locales/translation-info.yml | 31 ++ features/landing_page.feature | 9 + features/step_definitions/interface_steps.rb | 13 + features/support/paths.rb | 18 + 6 files changed, 474 insertions(+), 5 deletions(-) create mode 100644 Gemfile.lock create mode 100644 features/landing_page.feature create mode 100644 features/step_definitions/interface_steps.rb create mode 100644 features/support/paths.rb diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..94fe262 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,395 @@ +GIT + remote: git://github.com/josevalim/rails-footnotes.git + revision: 087914beabb56c2e9979f63eeb0183591065dde3 + specs: + rails-footnotes (4.0.2) + rails (>= 3.2) + +GIT + remote: git://github.com/svenfuchs/i18n-active_record.git + revision: 2d9a22b6a4e5d809782cdbfa65b14d9e47aa27fc + specs: + i18n-active_record (0.0.2) + i18n (>= 0.5.0) + +GEM + remote: http://rubygems.org/ + specs: + actionmailer (4.0.0) + actionpack (= 4.0.0) + mail (~> 2.5.3) + actionpack (4.0.0) + activesupport (= 4.0.0) + builder (~> 3.1.0) + erubis (~> 2.7.0) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + activemodel (4.0.0) + activesupport (= 4.0.0) + builder (~> 3.1.0) + activerecord (4.0.0) + activemodel (= 4.0.0) + activerecord-deprecated_finders (~> 1.0.2) + activesupport (= 4.0.0) + arel (~> 4.0.0) + activerecord-deprecated_finders (1.0.3) + activerecord-session_store (0.1.0) + actionpack (>= 4.0.0, < 5) + activerecord (>= 4.0.0, < 5) + railties (>= 4.0.0, < 5) + activesupport (4.0.0) + i18n (~> 0.6, >= 0.6.4) + minitest (~> 4.2) + multi_json (~> 1.3) + thread_safe (~> 0.1) + tzinfo (~> 0.3.37) + acts_as_list (0.4.0) + activerecord (>= 3.0) + addressable (2.3.6) + arel (4.0.2) + awesome_print (1.2.0) + bcrypt (3.1.7) + better_errors (1.1.0) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + builder (3.1.4) + callsite (0.0.11) + capistrano (2.15.5) + highline + net-scp (>= 1.0.0) + net-sftp (>= 2.0.0) + net-ssh (>= 2.0.14) + net-ssh-gateway (>= 1.1.0) + capybara (2.4.1) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + carmen (1.0.1) + unicode_utils (~> 1.4.0) + carmen-rails (1.0.1) + carmen (~> 1.0.0) + rails + carrierwave (0.10.0) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + json (>= 1.7) + mime-types (>= 1.16) + carrierwave-imageoptimizer (1.2.1) + carrierwave (~> 0.8) + image_optimizer (~> 1.2) + celluloid (0.15.2) + timers (~> 1.1.0) + childprocess (0.5.3) + ffi (~> 1.0, >= 1.0.11) + chunky_png (1.3.1) + coderay (1.1.0) + coffee-rails (4.0.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.0) + coffee-script (2.3.0) + coffee-script-source + execjs + coffee-script-source (1.7.1) + compass (0.12.7) + chunky_png (~> 1.2) + fssm (>= 0.2.7) + sass (~> 3.2.19) + compass-rails (1.1.7) + compass (>= 0.12.2) + sprockets (<= 2.11.0) + coveralls (0.7.0) + multi_json (~> 1.3) + rest-client + simplecov (>= 0.7) + term-ansicolor + thor + crack (0.4.2) + safe_yaml (~> 1.0.0) + cucumber (1.3.15) + builder (>= 2.1.2) + diff-lcs (>= 1.1.3) + gherkin (~> 2.12) + multi_json (>= 1.7.5, < 2.0) + multi_test (>= 0.1.1) + cucumber-rails (1.4.1) + capybara (>= 1.1.2, < 3) + cucumber (>= 1.3.8, < 2) + mime-types (~> 1.16) + nokogiri (~> 1.5) + rails (>= 3, < 5) + database_cleaner (1.3.0) + debug_inspector (0.0.2) + diff-lcs (1.2.5) + docile (1.1.5) + erubis (2.7.0) + execjs (2.2.1) + factory_girl (4.4.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.4.1) + factory_girl (~> 4.4.0) + railties (>= 3.0.0) + faraday (0.9.0) + multipart-post (>= 1.2, < 3) + ffi (1.9.3) + font-awesome-rails (4.1.0.0) + railties (>= 3.2, < 5.0) + forgery (0.6.0) + formatador (0.2.5) + foundation-rails (5.3.1.0) + railties (>= 3.1.0) + sass (>= 3.2.0) + fssm (0.2.10) + geocoder (1.2.3) + gherkin (2.12.2) + multi_json (~> 1.3) + guard (2.6.1) + formatador (>= 0.2.4) + listen (~> 2.7) + lumberjack (~> 1.0) + pry (>= 0.9.12) + thor (>= 0.18.1) + guard-rspec (4.2.10) + guard (~> 2.1) + rspec (>= 2.14, < 4.0) + haml (4.0.5) + tilt + haml-rails (0.5.1) + actionpack (~> 4.0.0) + activesupport (~> 4.0.0) + haml (>= 3.1, < 5.0) + railties (~> 4.0.0) + highline (1.6.21) + hike (1.2.3) + httpauth (0.2.1) + i18n (0.6.11) + image_optimizer (1.2.1) + jquery-rails (3.1.1) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + jquery-ui-rails (5.0.0) + railties (>= 3.2.16) + json (1.8.1) + jwt (0.1.13) + multi_json (>= 1.5) + launchy (2.4.2) + addressable (~> 2.3) + listen (2.7.9) + celluloid (>= 0.15.2) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + lumberjack (1.0.9) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + meta_request (0.3.3) + callsite (~> 0.0, >= 0.0.11) + rack-contrib (~> 1.1) + railties (>= 3.0.0, < 5.0.0) + method_source (0.8.2) + mime-types (1.25.1) + mini_magick (3.7.0) + subexec (~> 0.2.1) + mini_portile (0.6.0) + minitest (4.7.5) + multi_json (1.10.1) + multi_test (0.1.1) + multipart-post (2.0.0) + nested_form (0.3.2) + net-scp (1.2.1) + net-ssh (>= 2.6.5) + net-sftp (2.1.2) + net-ssh (>= 2.6.5) + net-ssh (2.9.1) + net-ssh-gateway (1.2.0) + net-ssh (>= 2.6.5) + netrc (0.7.7) + nokogiri (1.6.2.1) + mini_portile (= 0.6.0) + oauth (0.4.7) + oauth2 (0.8.1) + faraday (~> 0.8) + httpauth (~> 0.1) + jwt (~> 0.1.4) + multi_json (~> 1.0) + rack (~> 1.2) + paper_trail (3.0.3) + activerecord (>= 3.0, < 5.0) + activesupport (>= 3.0, < 5.0) + pg (0.17.1) + polyglot (0.3.5) + pry (0.10.0) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + rack (1.5.2) + rack-contrib (1.1.0) + rack (>= 0.9.1) + rack-test (0.6.2) + rack (>= 1.0) + rails (4.0.0) + actionmailer (= 4.0.0) + actionpack (= 4.0.0) + activerecord (= 4.0.0) + activesupport (= 4.0.0) + bundler (>= 1.3.0, < 2.0) + railties (= 4.0.0) + sprockets-rails (~> 2.0.0) + rails-assets-cdn (0.1.0) + rails + rails_12factor (0.0.2) + rails_serve_static_assets + rails_stdout_logging + rails_serve_static_assets (0.0.2) + rails_stdout_logging (0.0.3) + railties (4.0.0) + actionpack (= 4.0.0) + activesupport (= 4.0.0) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (10.3.2) + rb-fsevent (0.9.4) + rb-inotify (0.9.5) + ffi (>= 0.5.0) + rest-client (1.7.2) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) + rspec (3.0.0) + rspec-core (~> 3.0.0) + rspec-expectations (~> 3.0.0) + rspec-mocks (~> 3.0.0) + rspec-core (3.0.2) + rspec-support (~> 3.0.0) + rspec-expectations (3.0.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.0.0) + rspec-mocks (3.0.2) + rspec-support (~> 3.0.0) + rspec-rails (3.0.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.0.0) + rspec-expectations (~> 3.0.0) + rspec-mocks (~> 3.0.0) + rspec-support (~> 3.0.0) + rspec-support (3.0.2) + rubyzip (1.1.6) + rvm-capistrano (1.5.3) + capistrano (~> 2.15.4) + safe_yaml (1.0.3) + sass (3.2.19) + sass-rails (4.0.3) + railties (>= 4.0.0, < 5.0) + sass (~> 3.2.0) + sprockets (~> 2.8, <= 2.11.0) + sprockets-rails (~> 2.0) + selenium-webdriver (2.42.0) + childprocess (>= 0.5.0) + multi_json (~> 1.0) + rubyzip (~> 1.0) + websocket (~> 1.0.4) + simplecov (0.9.0) + docile (~> 1.1.0) + multi_json + simplecov-html (~> 0.8.0) + simplecov-html (0.8.0) + sitemap_generator (5.0.4) + builder + slop (3.6.0) + sorcery (0.8.6) + bcrypt (~> 3.1) + oauth (~> 0.4, >= 0.4.4) + oauth2 (>= 0.8.0, < 1.0.0) + sprockets (2.11.0) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + sprockets-rails (2.0.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (~> 2.8) + subexec (0.2.3) + term-ansicolor (1.3.0) + tins (~> 1.0) + thor (0.19.1) + thread_safe (0.3.4) + tilt (1.4.1) + timers (1.1.0) + tins (1.3.0) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + tzinfo (0.3.40) + uglifier (2.5.3) + execjs (>= 0.3.0) + json (>= 1.8.0) + unicode_utils (1.4.0) + webmock (1.18.0) + addressable (>= 2.3.6) + crack (>= 0.3.2) + websocket (1.0.7) + wysiwyg-rails (1.1.6) + font-awesome-rails (= 4.1.0.0) + railties (>= 3.2, < 5.0) + xpath (2.0.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + activerecord-session_store + acts_as_list + awesome_print + better_errors + binding_of_caller + capistrano + capybara + carmen-rails + carrierwave + carrierwave-imageoptimizer + coffee-rails (~> 4.0.0) + compass-rails (~> 1.1.3) + coveralls + cucumber-rails + database_cleaner + factory_girl_rails + font-awesome-rails + forgery + foundation-rails + geocoder + guard-rspec + haml + haml-rails + i18n-active_record! + jquery-rails + jquery-ui-rails + launchy + meta_request + mini_magick + nested_form + oauth2 (~> 0.8.0) + paper_trail + pg + rails (= 4.0.0) + rails-assets-cdn + rails-footnotes! + rails_12factor + rspec + rspec-rails + rvm-capistrano + sass-rails (~> 4.0.0) + selenium-webdriver + simplecov + sitemap_generator + sorcery (>= 0.8.1) + uglifier (>= 1.3.0) + unicorn + wdm (>= 0.1.0) + webmock + wysiwyg-rails diff --git a/config/database.yml b/config/database.yml index 5865dff..b637097 100644 --- a/config/database.yml +++ b/config/database.yml @@ -18,8 +18,8 @@ development: adapter: postgresql encoding: unicode database: bike_bike_dev - username: bike_bike - password: NewOrleans@)!# + username: analyst + password: host: 127.0.0.1 port: 5432 pool: 5 @@ -34,12 +34,12 @@ development: # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. -test: +test: &test adapter: postgresql encoding: unicode database: bike_bike_test - username: bike_bike - password: NewOrleans@)!# + username: analyst + password: host: 127.0.0.1 port: 5432 pool: 5 @@ -53,3 +53,6 @@ production: host: 127.0.0.1 port: 5432 pool: 5 + +cucumber: + <<: *test diff --git a/config/locales/translation-info.yml b/config/locales/translation-info.yml index e69de29..db60049 100644 --- a/config/locales/translation-info.yml +++ b/config/locales/translation-info.yml @@ -0,0 +1,31 @@ +--- +nola_2013.about: + languages: [] + pages: + - / + data: [] +home.its_awesome: + languages: [] + pages: + - / + data: [] +Conferences: + languages: [] + pages: + - / + data: [] +Organizations: + languages: [] + pages: + - / + data: [] +Resources: + languages: [] + pages: + - / + data: [] +Sign_In: + languages: [] + pages: + - / + data: [] diff --git a/features/landing_page.feature b/features/landing_page.feature new file mode 100644 index 0000000..88185ee --- /dev/null +++ b/features/landing_page.feature @@ -0,0 +1,9 @@ +Feature: Landing Page + As a person interested in bikebike + I want to find out about the current bikebike + In order to attend the conference + + Scenario: Read landing page content + Given I am on the landing page + Then I can read about the current bikebike + And I can register for the conference \ No newline at end of file diff --git a/features/step_definitions/interface_steps.rb b/features/step_definitions/interface_steps.rb new file mode 100644 index 0000000..2e97ad6 --- /dev/null +++ b/features/step_definitions/interface_steps.rb @@ -0,0 +1,13 @@ +Given(/^I am on the (.+) page$/) do |page_name| + visit path_to(page_name) +end + +Then(/^I can read about the current bikebike$/) do + within('#conference-name') { expect(page).to have_text 'Bike!Bike!' } + within('#conference-location') { expect(page).to have_text 'Columbus, Ohio' } + within('#conference-date') { expect(page).to have_text 'August 30 - September 1' } +end + +Then(/^I can register for the conference$/) do + expect(page).to have_link 'Register' +end diff --git a/features/support/paths.rb b/features/support/paths.rb new file mode 100644 index 0000000..b8adec2 --- /dev/null +++ b/features/support/paths.rb @@ -0,0 +1,18 @@ +module NavigationHelpers + def path_to(page_name) + case page_name + when /^landing$/i + path = 'root' + end + + begin + self.send((path + '_url').to_sym) + rescue Object => e + raise "Can't find mapping from \"#{page_name}\" to a path.\n" + + "#{path}_url\n" + + "Now, go and add a mapping in #{__FILE__}" + end + end +end + +World(NavigationHelpers)