Skip to content
Extraits de code Groupes Projets
Valider 8029cb07 rédigé par Maxwell Salzberg's avatar Maxwell Salzberg
Parcourir les fichiers

SM MS basic api wip. able to get a users public profile

parent a7c0888a
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -117,6 +117,7 @@ end ...@@ -117,6 +117,7 @@ end
group :test do group :test do
gem 'capybara', '~> 0.3.9' gem 'capybara', '~> 0.3.9'
gem 'cucumber-rails', '0.3.2' gem 'cucumber-rails', '0.3.2'
gem 'cucumber-api-steps', :require => false
gem 'database_cleaner', '0.6.0' gem 'database_cleaner', '0.6.0'
gem 'diaspora-client', :git => 'git://github.com/diaspora/diaspora-client.git' gem 'diaspora-client', :git => 'git://github.com/diaspora/diaspora-client.git'
#"0.1.0", #:path => '~/workspace/diaspora-client' #"0.1.0", #:path => '~/workspace/diaspora-client'
......
...@@ -150,6 +150,9 @@ GEM ...@@ -150,6 +150,9 @@ GEM
gherkin (~> 2.5.0) gherkin (~> 2.5.0)
json (>= 1.4.6) json (>= 1.4.6)
term-ansicolor (>= 1.0.6) term-ansicolor (>= 1.0.6)
cucumber-api-steps (0.6)
cucumber (>= 0.8.3)
jsonpath (>= 0.1.2)
cucumber-rails (0.3.2) cucumber-rails (0.3.2)
cucumber (>= 0.8.0) cucumber (>= 0.8.0)
culerity (0.2.15) culerity (0.2.15)
...@@ -235,6 +238,8 @@ GEM ...@@ -235,6 +238,8 @@ GEM
jasmine-core (1.2.0.rc1) jasmine-core (1.2.0.rc1)
json (1.4.6) json (1.4.6)
json_pure (1.6.1) json_pure (1.6.1)
jsonpath (0.4.2)
multi_json
jwt (0.1.3) jwt (0.1.3)
json (>= 1.2.4) json (>= 1.2.4)
linecache (0.43) linecache (0.43)
...@@ -481,6 +486,7 @@ DEPENDENCIES ...@@ -481,6 +486,7 @@ DEPENDENCIES
carrierwave (= 0.5.2) carrierwave (= 0.5.2)
chef (= 0.9.12) chef (= 0.9.12)
cloudfiles (= 1.4.10) cloudfiles (= 1.4.10)
cucumber-api-steps
cucumber-rails (= 0.3.2) cucumber-rails (= 0.3.2)
database_cleaner (= 0.6.0) database_cleaner (= 0.6.0)
devise (~> 1.3.1) devise (~> 1.3.1)
......
...@@ -165,6 +165,12 @@ Diaspora::Application.routes.draw do ...@@ -165,6 +165,12 @@ Diaspora::Application.routes.draw do
get :me get :me
end end
namespace :api do
namespace :v0 do
get "/users/:username" => 'users#show', :as => 'user'
end
end
# Mobile site # Mobile site
......
...@@ -16,6 +16,8 @@ require 'capybara/rails' ...@@ -16,6 +16,8 @@ require 'capybara/rails'
require 'capybara/cucumber' require 'capybara/cucumber'
require 'capybara/session' require 'capybara/session'
require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links with onclick javascript handlers without using @culerity or @javascript require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links with onclick javascript handlers without using @culerity or @javascript
require 'cucumber/api_steps'
# Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
# order to ease the transition to Capybara we set the default here. If you'd # order to ease the transition to Capybara we set the default here. If you'd
# prefer to use XPath just remove this line and adjust any selectors in your # prefer to use XPath just remove this line and adjust any selectors in your
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# licensed under the Affero General Public License version 3 or later. See # licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file. # the COPYRIGHT file.
class Stream::Aspect< Stream::Base class Stream::Aspect < Stream::Base
# @param user [User] # @param user [User]
# @param inputted_aspect_ids [Array<Integer>] Ids of aspects for given stream # @param inputted_aspect_ids [Array<Integer>] Ids of aspects for given stream
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter