Permalink
Browse files

Merge branch 'develop' of github.com:weed/p130121-twitter-tdd into de…

…velop

Conflicts:
	spec/requests/tweet_pages_spec.rb
  • Loading branch information...
2 parents 953894f + 6198709 commit 6fc1bba088cc864288b85d9139120321a43dd05e @utwang utwang committed Mar 7, 2013
View
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Settings><!--This file was automatically generated by Ruby plugin.
+You are allowed to:
+1. Reorder generators
+2. Remove generators
+3. Add installed generators
+To add new installed generators automatically delete this file and reload the project.
+--><GeneratorsGroup><Generator name="active_record:migration" /><Generator name="active_record:model" /><Generator name="active_record:observer" /><Generator name="active_record:session_migration" /><Generator name="controller" /><Generator name="erb:controller" /><Generator name="erb:mailer" /><Generator name="erb:scaffold" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="mailer" /><Generator name="metal" /><Generator name="migration" /><Generator name="model" /><Generator name="model_subclass" /><Generator name="observer" /><Generator name="performance_test" /><Generator name="plugin" /><Generator name="resource" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="session_migration" /><Generator name="stylesheets" /><Generator name="test_unit:controller" /><Generator name="test_unit:helper" /><Generator name="test_unit:integration" /><Generator name="test_unit:mailer" /><Generator name="test_unit:model" /><Generator name="test_unit:observer" /><Generator name="test_unit:performance" /><Generator name="test_unit:plugin" /><Generator name="test_unit:scaffold" /></GeneratorsGroup></Settings>
View
@@ -0,0 +1 @@
+p130121-twitter-tdd
View
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Settings><!--This file was automatically generated by Ruby plugin.
+You are allowed to:
+1. Remove rake task
+2. Add existing rake tasks
+To add existing rake tasks automatically delete this file and reload the project.
+--><RakeGroup description="" fullCmd="" taksId="rake" /></Settings>
View
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
+
View
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectRootManager" version="2" project-jdk-name="RVM: ruby-1.9.3-p194" project-jdk-type="RUBY_SDK" />
+</project>
+
View
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/.idea/p130121-twitter-tdd.iml" filepath="$PROJECT_DIR$/.idea/p130121-twitter-tdd.iml" />
+ </modules>
+ </component>
+</project>
+
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="RailsFacetType" name="Ruby on Rails">
+ <configuration>
+ <RAILS_FACET_CONFIG_ID NAME="RAILS_FACET_SUPPORT_REMOVED" VALUE="false" />
+ <RAILS_FACET_CONFIG_ID NAME="RAILS_TESTS_SOURCES_PATCHED" VALUE="true" />
+ <RAILS_FACET_CONFIG_ID NAME="RAILS_FACET_APPLICATION_ROOT" VALUE="$MODULE_DIR$" />
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager">
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" scope="PROVIDED" name="actionmailer (v3.2.10, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="actionpack (v3.2.10, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="activemodel (v3.2.10, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="activerecord (v3.2.10, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="activeresource (v3.2.10, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="activesupport (v3.2.10, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="arel (v3.0.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="builder (v3.0.4, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="bundler (v1.1.5, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="capybara (v1.1.4, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="childprocess (v0.3.6, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="coderay (v1.0.8, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="coffee-rails (v3.2.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="coffee-script (v2.2.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="coffee-script-source (v1.4.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="cucumber (v1.2.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="cucumber-rails (v1.3.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="cucumber-rails-training-wheels (v1.0.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="database_cleaner (v0.9.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.1.3, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="eventmachine (v1.0.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="execjs (v1.4.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="factory_girl (v4.1.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="factory_girl_rails (v4.1.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="faye-websocket (v0.4.6, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="ffi (v1.3.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="fuubar (v1.1.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="gherkin (v2.11.5, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="guard (v1.6.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="guard-cucumber (v1.3.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="guard-rspec (v2.4.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="guard-spork (v1.4.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="hike (v1.2.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="http_parser.rb (v0.5.3, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="i18n (v0.6.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="journey (v1.0.4, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v2.2.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="json (v1.7.6, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="libv8 (v3.11.8.13, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="listen (v0.7.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="lumberjack (v1.0.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="mail (v2.4.4, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="method_source (v0.8.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="mime-types (v1.19, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.5.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.5.6, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="poltergeist (v1.0.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="polyglot (v0.3.3, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="pry (v0.9.11.4, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="rack (v1.4.4, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="rack-cache (v1.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="rack-ssl (v1.3.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="rack-test (v0.6.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="rails (v3.2.10, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="railties (v3.2.10, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="rake (v10.0.3, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="rb-fsevent (v0.9.3, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="rb-inotify (v0.8.8, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="rdoc (v3.12, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="ref (v1.0.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="rspec (v2.12.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="rspec-core (v2.12.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v2.12.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="rspec-instafail (v0.2.4, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v2.12.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="rspec-rails (v2.12.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.0.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="rubyzip (v0.9.9, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="sass (v3.2.5, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="sass-rails (v3.2.6, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="selenium-webdriver (v2.29.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="simplecov (v0.7.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.7.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="slop (v3.4.3, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="spork (v0.9.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="sprockets (v2.2.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="sqlite3 (v1.3.7, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="therubyracer (v0.11.3, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="thor (v0.16.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="tilt (v1.3.3, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="treetop (v1.4.12, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="tzinfo (v0.3.35, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="uglifier (v1.3.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="websocket (v1.0.6, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="xpath (v0.1.4, RVM: ruby-1.9.3-p194) [gem]" level="application" />
+ </component>
+ <component name="RModuleSettingsStorage">
+ <LOAD_PATH number="0" />
+ <I18N_FOLDERS number="1" string0="$MODULE_DIR$/config/locales" />
+ </component>
+</module>
+
@@ -0,0 +1,5 @@
+<component name="DependencyValidationManager">
+ <state>
+ <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+ </state>
+</component>
View
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
+ </component>
+</project>
+
Oops, something went wrong.

0 comments on commit 6fc1bba

Please sign in to comment.