wagn 1.20.2 → 1.20.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aacbd8d9020a2bbde198f363933365b287b919e0
-  data.tar.gz: c99bec35184f50ca1e3bb10326b325693d909518
+  metadata.gz: 0c371f9bcffbb3a47f5403adf9db669a2f7f75a1
+  data.tar.gz: f08a691bd55e343727a8469b972f2f982a8cf171
 SHA512:
-  metadata.gz: 278a1e0e50eab3b2b77a89cd5f99455cc39e3cb3613a2ddc81f451237a4d334f54b93f0d75502a62af84e231fa7e0086c0192acad36d361a6368e5b067283c45
-  data.tar.gz: 1a5166f2a1afe02442e37e40bdb70cfec3895911521dd6389488fbac3561eeff1bf027e7f825138f7202e48b648250db9e9c0fc7dc52ba5257466a68f00cf636
+  metadata.gz: 3f04c347271eef3e4208d38327395e7e84817c119da7bd4af17957c0f529fd2975f03e0f3264ca3af9c3fb60e8b44ce33d3ef7c5be94f16f68d18f3bc84fe1b0
+  data.tar.gz: 3f81e5e3d6a00b2082c03b8409ab5349a1f3e04e6f3183c149d4c303275a9fe06962e5f0450ee22609313008ef9fd65726f733d0ff56fea010ae64b002c28f9d

data/features/attach.feature

@@ -77,6 +77,7 @@ Feature: File Upload
     And I upload the image "image.png"
     And I wait for ajax response
     And I press "Submit"
+    And I wait for ajax response
     And I edit "Vignesh has a complicated relationship"
     And I upload the image "image2.jpg"
     And I wait for ajax response
@@ -96,6 +97,7 @@ Feature: File Upload
     And I upload the image "image.png"
     And I wait for ajax response
     And I press "Submit"
+    And I wait for ajax response
     And I edit "Vignesh has a complicated relationship"
     And I press "Submit"
     And I wait for ajax response

data/features/autonaming.feature

@@ -1,3 +1,4 @@
+@javascript
 Feature: autonaming
   In order to save effort from thinking up names
   As an Editor

data/features/layouts.feature

@@ -7,12 +7,9 @@ Feature: Layouts
   Background:
     Given I am signed in as Joe Admin
     And I create HTML card "simple layout" with content "Simple Header {{_main}} Simple Footer"
-    And I wait a sec
     And the card "*all+*layout" contains "[[simple layout]]"
     And I create Pointer card "User+*type+*layout" with content "[[user layout]]"
-    And I wait a sec
     And I create HTML card "user layout" with content "User Header {{_main}}"
-    And I wait a sec
 
   Scenario: I visit a Basic card with the simple layout
     When I go to card "*account links"

data/features/navbox.feature

@@ -7,12 +7,28 @@ Feature: Navbox
     Given I go to the homepage
     And I fill in "_keyword" with "Joe"
 # possible to use placeholder?
-    And I wait a sec    
+    And I wait a sec
     Then I should see "Joe Camel"
     And I should see "JoeNow"
     Then I press enter to search
-#When I follow "search: Joe" 
+#When I follow "search: Joe"
 # fixme: unable to click link so far...
     And I wait a sec
     Then I should see "Search results"
-  
+
+  Scenario: wql search
+    Given I go to the homepage
+    And I fill in "_keyword" with '{"type":"User"}'
+    Then I press enter to search
+    And I wait a sec
+    Then I should see "Search results"
+    And I should see "Big Brother"
+
+  Scenario: paging
+    Given I go to the homepage
+    And I fill in "_keyword" with "skin"
+    Then I press enter to search
+    Then I should see "Search results"
+    And I should see "Sample Skin"
+    When I click on "2"
+    Then I should see "simplex skin+style"

data/features/reference.feature

@@ -15,6 +15,7 @@ Feature: Reference
     And I press "Rename"
     And I press "Rename and Update"
     And I wait for ajax response
+    And I wait a sec
     Then I go to card "Kawaii Man"
     And I should see "Srivigneshwar"
 

data/features/step_definitions/email_steps.rb

@@ -189,7 +189,7 @@ Then /^save and open all raw emails$/ do
 end
 
 Then /^(.*) should be notified that "(.*)"$/ do |username, subject|
-  Timeout.timeout(Capybara.default_wait_time) do
+  Timeout.timeout(Capybara.default_max_wait_time) do
     sleep(0.5) while page.evaluate_script("jQuery.active") != 0
   end
   Delayed::Worker.new.work_off
@@ -203,7 +203,7 @@ Then /^(.*) should be notified that "(.*)"$/ do |username, subject|
 end
 
 Then /^No notification should be sent$/ do
-  Timeout.timeout(Capybara.default_wait_time) do
+  Timeout.timeout(Capybara.default_max_wait_time) do
     sleep(0.5) while page.evaluate_script("jQuery.active") != 0
   end
   Delayed::Worker.new.work_off

data/features/step_definitions/wagn_steps.rb

@@ -93,26 +93,29 @@ end
 
 def set_content name, content, _cardtype=nil
   Capybara.ignore_hidden_elements = false
-  ace_editors = all(".ace-editor-textarea[name='#{name}']")
-  pm_editors = all(".prosemirror-editor > [name='#{name}']")
-  if ace_editors.present? &&
-     page.evaluate_script("typeof ace != 'undefined'")
-    page.execute_script "ace.edit($('.ace_editor').get(0))"\
-        ".getSession().setValue('#{content}')"
-  elsif pm_editors.present?
-    editor_id = pm_editors.first.first(:xpath, ".//..")[:id]
-    set_prosemirror_content editor_id, content
-  else
-    # rescue Selenium::WebDriver::Error::JavascriptError
+  wait_for_ajax
+  set_ace_editor_content(name, content) ||
+    set_pm_editor_content(name, content) ||
     fill_in(name, with: content)
-  end
   Capybara.ignore_hidden_elements = true
 end
 
-def set_prosemirror_content editor_id, content
+def set_ace_editor_content name, content
+  return unless all(".ace-editor-textarea[name='#{name}']").present? &&
+                page.evaluate_script("typeof ace != 'undefined'")
+  sleep(0.5)
+  page.execute_script "ace.edit($('.ace_editor').get(0))"\
+                      ".getSession().setValue('#{content}')"
+  true
+end
+
+def set_pm_editor_content name, content
+  (editors = all(".prosemirror-editor > [name='#{name}']"))
+  return unless editors.present?
+  editor_id = editors.first.first(:xpath, ".//..")[:id]
   escaped_quotes = content.gsub("'", "\\'")
-  page.execute_script "getProseMirror('#{editor_id}')"\
-                      ".setContent('#{escaped_quotes}', 'text')"
+  page.execute_script "$('##{editor_id} .ProseMirror').text('#{escaped_quotes}')"
+  true
 end
 
 content_re = /^(.*) creates?\s*a?\s*([^\s]*) card "(.*)" with content "(.*)"$/
@@ -148,10 +151,16 @@ When /^(?:|I )enter "([^"]*)" into "([^"]*)"$/ do |value, field|
 end
 
 When /^(?:|I )upload the (.+) "(.+)"$/ do |attachment_name, filename|
-  script = "$('input[type=file]').css('opacity','1');"
-  page.driver.browser.execute_script(script)
-  file = File.join Wagn.gem_root, "features", "support", filename
-  attach_file "card_#{attachment_name}", file
+  Capybara.ignore_hidden_elements = false
+  attach_file "card_#{attachment_name}", find_file(filename)
+  Capybara.ignore_hidden_elements = true
+end
+
+def find_file filename
+  roots = "{#{Cardio.root}/mod/**,#{Cardio.gem_root}/mod/**,#{Wagn.gem_root}}"
+  paths = Dir.glob(File.join(roots, "features", "support", filename))
+  raise ArgumentError, "couldn't find file '#{filename}'" if paths.empty?
+  paths.first
 end
 
 Given /^(.*) (is|am) watching "([^\"]+)"$/ do |user, _verb, cardname|
@@ -177,19 +186,32 @@ When /I wait (\d+) seconds$/ do |period|
   sleep period.to_i
 end
 
-When /^I wait for ajax response$/ do
-  Timeout.timeout(Capybara.default_wait_time) do
-    sleep(0.5) while page.evaluate_script("jQuery.active") != 0
+def wait_for_ajax
+  Timeout.timeout(Capybara.default_max_wait_time) do
+    begin
+      sleep(0.5) until finished_all_ajax_requests?
+    rescue Selenium::WebDriver::Error::UnknownError
+      sleep(2) # HACK: to fix the issue that in layout.feature jQuery
+      # after the layout change is not defined
+    end
   end
 end
 
+def finished_all_ajax_requests?
+  page.evaluate_script("jQuery.active").zero?
+end
+
+When /^I wait for ajax response$/ do
+  wait_for_ajax
+end
+
 # Then /what/ do
 #   save_and_open_page
 # end
 #
 Then /debug/ do
   require "pry"
-  binding.pry #
+  #
   nil
 end
 #   if RUBY_VERSION =~ /^2/
@@ -207,6 +229,7 @@ def create_card username, cardtype, cardname, content=""
       visit "/card/new?card[name]=#{CGI.escape(cardname)}&type=#{cardtype}"
       yield if block_given?
       click_button "Submit"
+      wait_for_ajax
     end
   end
 end
@@ -358,7 +381,7 @@ Then /^"([^"]*)" should be selected for "([^"]*)"$/ do |value, field|
   expect(selected.inner_html).to match /#{value}/
 end
 
-Then /^"([^"]*)" should be signed in$/ do |user|  # "
+Then /^"([^"]*)" should be signed in$/ do |user| # "
   has_css?(".my-card-link", text: user)
 end
 
@@ -411,8 +434,21 @@ When /^I fill in "([^\"]*)" with$/ do |field, value|
   fill_in(field, with: value)
 end
 
+When(/^I scroll (-?\d+) pixels$/) do |number|
+  page.execute_script "window.scrollBy(0, #{number})"
+end
+
+When(/^I scroll (\d+) pixels down$/) do |number|
+  page.execute_script "window.scrollBy(0, #{number})"
+end
+
+When(/^I scroll (\d+) pixels up$/) do |number|
+  page.execute_script "window.scrollBy(0, -#{number})"
+end
+
 module Capybara
   module Node
+    # adapt capybara methods to fill in forms to wagn's form interface
     module Actions
       alias_method :original_fill_in, :fill_in
       alias_method :original_select, :select

data/features/step_definitions/web_steps.rb

@@ -43,6 +43,10 @@ When /^(?:|I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|
   fill_in(field, with: value)
 end
 
+When /^(?:|I )fill in "([^"]*)" with '([^']*)'$/ do |field, value|
+  fill_in(field, with: value)
+end
+
 When /^(?:|I )fill in "([^"]*)" for "([^"]*)"$/ do |value, field|
   fill_in(field, with: value)
 end

data/features/step_definitions/window_steps.rb

@@ -8,8 +8,9 @@ When /^I open a new window for (.*)$/ do |account_name|
 END_TAG
   page.execute_script(str)
   page.driver.browser.switch_to.window(page.driver.browser.window_handles.last)
-  accounted = Card[account_name]
-  visit "/update/:signin?card[subcards][%2B*email][content]=#{accounted.account.email}&card[subcards][%2B*password][content]=joe_pass"
+  email = Card[account_name].account.email
+  visit "/update/:signin?card[subcards][%2B*email][content]=#{email}&"\
+        "card[subcards][%2B*password][content]=joe_pass"
 end
 
 When /I switch to (.+) window$/ do |window|

data/features/support/env.rb

@@ -31,12 +31,16 @@ end
 require "cucumber/rails"
 require "test_after_commit"
 
+Capybara.register_driver :selenium do |app|
+  Capybara::Selenium::Driver.new(app, browser: :chrome)
+end
+
 # 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
 # prefer to use XPath just remove this line and adjust any selectors in your
 # steps to use the XPath syntax.
 Capybara.default_selector = :css
-Capybara.default_wait_time = 5
+Capybara.default_max_wait_time = 20
 Cardio.config.paging_limit = 10
 # By default, any exception happening in your Rails application will bubble up
 # to Cucumber so that your scenario will fail. This is a different from how

data/lib/wagn/config/initializers/secret_token.rb

@@ -6,5 +6,9 @@
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 
-Wagn.config.secret_token = "65632e048d6c80d1e63c911e1a40a51072413543f3182e0261b52e3812b2c9f0ee81828fa5688a34c13a78e438a4b56f497135dc079a4e4460733d555968a2f8"
-Wagn.config.secret_key_base = "65632e048d6c80d1e63c911e1a40a51072413543f3182e0261b52e3812b2c9f0ee81828fa5688a34c13a78e438a4b56f497135dc079a4e4460733d555968a2f8"
+Wagn.config.secret_token = "65632e048d6c80d1e63c911e1a40a51072413543f3182e0261"\
+                           "b52e3812b2c9f0ee81828fa5688a34c13a78e438a4b56f4971"\
+                           "35dc079a4e4460733d555968a2f8"
+Wagn.config.secret_key_base = "65632e048d6c80d1e63c911e1a40a51072413543f3182e0"\
+                              "261b52e3812b2c9f0ee81828fa5688a34c13a78e438a4b5"\
+                              "6f497135dc079a4e4460733d555968a2f8"

data/lib/wagn/generators/wagn/templates/Gemfile

@@ -90,7 +90,8 @@ group :test do
   # CUKES see features dir
   gem 'cucumber-rails', '~> 1.4', :require=>false # feature-driven-development suite
   gem 'capybara', '~> 2.7'
-  gem 'selenium-webdriver', '~> 2.53'
+  gem 'selenium-webdriver', '~> 3.3'
+  gem 'chromedriver-helper', '~> 1.0.0'
   # gem 'capybara-webkit'
   gem 'launchy'                                # lets cucumber launch browser windows
 

data/lib/wagn/generators/wagn/wagn_generator.rb

@@ -17,7 +17,7 @@ class WagnGenerator < Rails::Generators::AppBase
                desc: "Prepare deck for wagn core testing"
 
   class_option "gem-path",
-               type: :string, aliases: "-g", default: false, group: :runtime,
+               type: :string, aliases: "-g", default: "", group: :runtime,
                desc: "Path to local gem installation " \
                      "(Default, use env WAGN_GEM_PATH)"
 
@@ -157,7 +157,7 @@ class WagnGenerator < Rails::Generators::AppBase
   protected
 
   def core_dev_setup
-    unless @gem_path
+    if @gem_path.blank?
       @gemfile_gem_path =
         @gem_path = ask("Enter the path to your local wagn gem installation: ")
     end
@@ -171,7 +171,7 @@ class WagnGenerator < Rails::Generators::AppBase
     @wagn_gem_root = File.join @gem_path, "wagn"
     inside "spec" do
       template File.join("javascripts", "support", "wagn_jasmine.yml"),
-                File.join("javascripts", "support", "jasmine.yml")
+               File.join("javascripts", "support", "jasmine.yml")
     end
 
     # ending slash is important in order to load support and step folders
@@ -188,7 +188,7 @@ class WagnGenerator < Rails::Generators::AppBase
     inside "spec" do
       template "spec_helper.rb"
       template File.join("javascripts", "support", "deck_jasmine.yml"),
-                File.join("javascripts", "support", "jasmine.yml")
+               File.join("javascripts", "support", "jasmine.yml")
     end
   end
 
@@ -242,6 +242,7 @@ class WagnGenerator < Rails::Generators::AppBase
     @app_const_base ||= defined_app_const_base ||
                         app_name.gsub(/\W/, "_").squeeze("_").camelize
   end
+
   alias camelized app_const_base
 
   def app_const
@@ -250,13 +251,13 @@ class WagnGenerator < Rails::Generators::AppBase
 
   def valid_const?
     if app_const =~ /^\d/
-      raise Error, "Invalid application name #{app_name}. " \
+      raise Thor::Error, "Invalid application name #{app_name}. " \
                    "Please give a name which does not start with numbers."
     #    elsif RESERVED_NAMES.include?(app_name)
     #      raise Error, "Invalid application name #{app_name}." \
     # "Please give a name which does not match one of the reserved rails words."
     elsif Object.const_defined?(app_const_base)
-      raise Error, "Invalid application name #{app_name}, " \
+      raise Thor::Error, "Invalid application name #{app_name}, " \
                    "constant #{app_const_base} is already in use. " \
                    "Please choose another application name."
     end

data/lib/wagn/script_wagn_loader.rb

@@ -2,7 +2,8 @@ require "pathname"
 
 module Wagn
   module ScriptWagnLoader
-    RUBY = File.join(*RbConfig::CONFIG.values_at("bindir", "ruby_install_name")) + RbConfig::CONFIG["EXEEXT"]
+    RUBY = File.join(*RbConfig::CONFIG.values_at("bindir", "ruby_install_name")) +
+           RbConfig::CONFIG["EXEEXT"]
     SCRIPT_WAGN = File.join("script", "wagn")
 
     def self.exec_script_wagn!
@@ -23,7 +24,8 @@ module Wagn
     end
 
     def self.in_wagn_application_subdirectory? path=Pathname.new(Dir.pwd)
-      File.exist?(File.join(path, SCRIPT_WAGN)) || !path.root? && in_wagn_application_subdirectory?(path.parent)
+      File.exist?(File.join(path, SCRIPT_WAGN)) ||
+        !path.root? && in_wagn_application_subdirectory?(path.parent)
     end
   end
 end

data/spec/controllers/card_controller_spec.rb

@@ -268,9 +268,9 @@ describe CardController do
     context "file" do
       before do
         Card::Auth.as_bot do
-          Card.create name: "mao2", type_code: "image",
-                      image: File.new(File.join(FIXTURES_PATH, "mao2.jpg"))
-          Card.create name: "mao2+*self+*read", content: "[[Administrator]]"
+          Card.create! name: "mao2", type_code: "image",
+                       image: File.new(File.join(FIXTURES_PATH, "mao2.jpg"))
+          Card.create! name: "mao2+*self+*read", content: "[[Administrator]]"
         end
       end
 

data/test/test_helper.rb

@@ -43,7 +43,9 @@ unless defined? TEST_ROOT
         renames = { "layout_type" => "Layout", "search_type" => "Search" }
         if card = Card["Sample #{renames[cardtype] || cardtype}"]
           url.gsub!(/:id/, "~#{card.id}")
-        else puts("ERROR finding 'Sample #{cardtype}'") end
+        else
+          puts("ERROR finding 'Sample #{cardtype}'")
+        end
       end
       url
     end
@@ -64,14 +66,15 @@ unless defined? TEST_ROOT
             constant = (name.camelize + "TestHelper").constantize
             class_eval { include constant }
           rescue NameError
-            filename = File.expand_path(TEST_ROOT + "/helpers/" + name + "_test_helper.rb")
-            require filename if first_time
+            filename = "#{name}_test_helper.rb"
+            filepath = File.expand_path(File.join(TEST_ROOT, "helpers", filename))
+            require filepath if first_time
             first_time = false
             retry
           end
         end
       end
-      alias test_helpers test_helper
+      alias_method :test_helpers, :test_helper
     end
 
     class RenderTest
@@ -86,27 +89,30 @@ unless defined? TEST_ROOT
           # FIXME: need a better data source for this?
           # args[:cardtypes] = YAML.load_file('db/bootstrap/card_codenames.yml').
           bootstrap_file = File.join(Cardio.gem_root, "db/bootstrap/cards.yml")
-          args[:cardtypes] = YAML.load_file(bootstrap_file).select do |p|
+          cardtypes = YAML.load_file(bootstrap_file).select do |p|
             !%w(set setting).member?(p[1]["codename"]) &&
               (card = Card[p[1]["name"]]) && card.type_id == Card::CardtypeID
-          end.map { |_k, v| v["codename"] }
+          end
+          args[:cardtypes] = cardtypes.map { |_k, v| v["codename"] }
         end
 
         args[:users].each_pair do |user, status|
           user = user.to_s
-          current_id = Integer === user ? user : Card[user].id
+          current_id = user.is_a?(Integer) ? user : Card[user].id
 
           args[:cardtypes].each do |cardtype|
             next if cardtype =~ /Cardtype|UserForm|Set|Fruit|Optic|Book/
 
-            title = url.gsub(/:id/, "").gsub(/\//, "_") + "_#{cardtype}"
-            login = (current_id == Card::AnonymousID ? "" : "integration_login_as '#{user}'")
+            title = url.gsub(/:id/, "").tr("/", "_") + "_#{cardtype}"
+            login =
+              (current_id == Card::AnonymousID ? "" : "integration_login_as '#{user}'")
             test_def = %{
               def test_render_#{title}_#{user}_#{status}
                 #{login}
                 url = prepare_url('#{url}', '#{cardtype}')
                 get url
-                assert_response #{status}, "\#\{url\} as #{user} should have status #{status}"
+                assert_response #{status},
+                                "\#\{url\} as #{user} should have status #{status}"
               end
             }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.20.2
+  version: 1.20.3
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.20.2
+        version: 1.20.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.20.2
+        version: 1.20.3
 description: a wiki approach to stuctured data, dynamic interaction,  and web design
 email:
 - info@wagn.org