wagn 1.20.1 → 1.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dffc37a2889618b5d050be8245b96f04c2e3158
-  data.tar.gz: 07cfa60ae76b35fd2f2198643bab61a10f6e5289
+  metadata.gz: aacbd8d9020a2bbde198f363933365b287b919e0
+  data.tar.gz: c99bec35184f50ca1e3bb10326b325693d909518
 SHA512:
-  metadata.gz: 7256a1ebc8ae176adf2cde46a6c05b5997f919730f295e9cf628a1541d8355a44e762441bb31ac444428226eb66ed5de957596a6c6b99223658ca6e08c4080cd
-  data.tar.gz: 8d522e43cf859b267263c9d7c2c88b24f7012760786ed6b41e55d972ee00e8e6679a34b7a0ebed495a615680cd9b68d3fdb7a5f8a71e2c9b40187a29a2b5d072
+  metadata.gz: 278a1e0e50eab3b2b77a89cd5f99455cc39e3cb3613a2ddc81f451237a4d334f54b93f0d75502a62af84e231fa7e0086c0192acad36d361a6368e5b067283c45
+  data.tar.gz: 1a5166f2a1afe02442e37e40bdb70cfec3895911521dd6389488fbac3561eeff1bf027e7f825138f7202e48b648250db9e9c0fc7dc52ba5257466a68f00cf636

data/features/pointer_inputs.feature

@@ -12,7 +12,7 @@ Feature: Pointer Inputs
   Scenario: Creating a card with select input
     Given I create Phrase card "friends+*right+*input" with content "select"
     When I go to card "Joe User+friends"
-    And I select "Joe Camel" from "pointer_select"
+    And I select "Joe Camel" from "Content"
     And I press "Submit"
     And I go to card "Joe User+friends"
     Then I should see "Joe Camel"
@@ -21,7 +21,7 @@ Feature: Pointer Inputs
     Given I create Phrase card "User+*type+*structure" with content "{{+friends}}"
     And I create Phrase card "friends+*right+*input" with content "select"
     When I edit "Joe User"
-    And I select "Joe Admin" from "pointer_select"
+    And I select "Joe Admin" from "+friends"
     And I press "Submit"
     And I go to card "Joe User"
     Then I should see "Joe Admin"
@@ -29,7 +29,7 @@ Feature: Pointer Inputs
   Scenario: Creating a card with multiselect input
     Given I create Phrase card "friends+*right+*input" with content "multiselect"
     When I go to card "Joe User+friends"
-    And I select "Joe Camel" from "pointer_multiselect"
+    And I select "Joe Camel" from "Content"
     And I press "Submit"
     And I go to card "Joe User+friends"
     Then I should see "Joe Camel"
@@ -38,7 +38,7 @@ Feature: Pointer Inputs
     Given I create Phrase card "User+*type+*structure" with content "{{+friends}}"
     And I create Phrase card "friends+*right+*input" with content "multiselect"
     When I edit "Joe User"
-    And I select "Joe Admin" from "pointer_multiselect"
+    And I select "Joe Admin" from "friends"
     And I press "Submit"
     And I go to card "Joe User"
     And I should see "Joe Admin"

data/features/step_definitions/wagn_steps.rb

@@ -91,7 +91,7 @@ When /^(.*) edits? "([^\"]*)" with plusses:/ do |username, cardname, plusses|
   end
 end
 
-def set_content name, content, cardtype=nil
+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}']")
@@ -103,7 +103,7 @@ def set_content name, content, cardtype=nil
     editor_id = pm_editors.first.first(:xpath, ".//..")[:id]
     set_prosemirror_content editor_id, content
   else
-#rescue Selenium::WebDriver::Error::JavascriptError
+    # rescue Selenium::WebDriver::Error::JavascriptError
     fill_in(name, with: content)
   end
   Capybara.ignore_hidden_elements = true
@@ -188,8 +188,9 @@ end
 # end
 #
 Then /debug/ do
-  require 'pry'
-  binding.pry
+  require "pry"
+  binding.pry #
+  nil
 end
 #   if RUBY_VERSION =~ /^2/
 #   else
@@ -409,3 +410,50 @@ end
 When /^I fill in "([^\"]*)" with$/ do |field, value|
   fill_in(field, with: value)
 end
+
+module Capybara
+  module Node
+    module Actions
+      alias_method :original_fill_in, :fill_in
+      alias_method :original_select, :select
+
+      def fill_in locator, options={}
+        wagn_fill_in(locator, options) || original_fill_in(locator, options)
+      end
+
+      def select value, options={}
+        wagn_select(value, options) || original_select(value, options)
+      end
+
+      def wagn_fill_in locator, options
+        el = labeled_field(:input, locator) || labeled_field(:textarea, locator)
+        return unless el
+        el.set options[:with]
+        true
+      end
+
+      def wagn_select value, options
+        el = labeled_field :select, options[:from], visible: false
+        return unless el
+        value = el.find("option", text: value, visible: false)["value"]
+        choose_value el, value
+        true
+      end
+
+      def choose_value el, value
+        id = el["id"]
+        session.execute_script("$('##{id}').val('#{value}')")
+        # session.execute_script("$('##{id}').trigger('chosen:updated')")
+        # session.execute_script("$('##{id}').change()")
+      end
+
+      def labeled_field type, label, options={}
+        label.gsub!(/^\+/, "") # because '+' is in an extra span,
+        # descendant-or-self::text doesn't find it
+        first :xpath,
+              "//label[descendant-or-self::text()='#{label}']/..//#{type}",
+              options.merge(wait: 5)
+      end
+    end
+  end
+end

data/features/step_definitions/web_steps.rb

@@ -55,28 +55,6 @@ When /^(?:|I )submit form$/ do
   find(:css, "button[type='submit']").click
 end
 
-When /^(?:|I )single-select "([^"]*)" from "([^"]*)"$/ do |value, field|
-  select =
-    find("label", text: field).find(:xpath, "..//select", visible: false)
-  value = select.find("option", text: value, visible: false)["value"]
-  page.execute_script("$('##{select['id']}').val('#{value}')")
-  page.execute_script("$('##{select['id']}').trigger('chosen:updated')")
-  page.execute_script("$('##{select['id']}').change()")
-
-  # code below doesn't work on wikirate because if you select an item in
-  # a very long list the list gets pushed below the navigation bar
-  # find("label", text: field).find(:xpath, "..//a[@class='chosen-single']")
-  #                           .click
-  # li = find("li", text: value, visible: false)
-  # li.click
-  # # If the list element is too far down the list then the first click
-  # # scrolls it up but doesn't select it. It needs another click.
-  # # A selected item is no longer visible (because the list disappears)
-  # if li.visible?
-  #   li.click
-  # end
-end
-
 # Use this step in conjunction with Rail's datetime_select helper. For example:
 # When I select "December 25, 2008 10:00" as the date and time
 When /^(?:|I )select "([^"]*)" as the date and time$/ do |time|

data/features/support/env.rb

@@ -83,3 +83,48 @@ ActionController::Base.allow_rescue = false
 # The :transaction strategy is faster, but might give you threading problems.
 # See https://github.com/cucumber/cucumber-rails/blob/master/features/choose_javascript_database_strategy.feature
 Cucumber::Rails::Database.javascript_strategy = :truncation
+
+# `LAUNCHY=1 cucumber` to open page on failure
+After do |scenario|
+  save_and_open_page if scenario.failed? && ENV["LAUNCHY"]
+end
+
+# `FAST=1 cucumber` to stop on first failure
+After do |scenario|
+  Cucumber.wants_to_quit = ENV["FAST"] && scenario.failed?
+end
+
+# `DEBUG=1 cucumber` to drop into debugger on failure
+After do |scenario|
+  next unless ENV["DEBUG"] && scenario.failed?
+  puts "Debugging scenario: #{scenario.name}"
+  if respond_to? :debugger
+    debugger
+  elsif binding.respond_to? :pry
+    binding.pry #
+  else
+    puts "Can't find debugger or pry to debug"
+  end
+end
+
+# `STEP=1 cucumber` to pause after each step
+AfterStep do |result, step|
+  next unless ENV["STEP"]
+  unless defined?(@counter)
+    #puts "Stepping through #{scenario.name}"
+    @counter = 0
+  end
+  @counter += 1
+  #print "At step ##{@counter} of #{scenario.steps.count}. Press Return to"\
+  #      " execute..."
+  print "Press Return to execute next step...\n"\
+        "(d=debug, c=continue, s=step, a=abort)"
+  case STDIN.getch
+  when "d" then
+    binding.pry #
+  when "c" then
+    ENV.delete "STEP"
+  when "a" then
+    Cucumber.wants_to_quit = true
+  end
+end

data/lib/wagn/commands/command.rb

@@ -10,6 +10,17 @@ module Wagn
         command += " 2>&1"
         exit $CHILD_STATUS.exitstatus unless system command
       end
+
+      # split special wagn args and original command args separated by '--'
+      def split_args args
+        before_split = true
+        wagn_args, command_args =
+          args.partition do |a|
+            before_split = (a == "--" ? false : before_split)
+          end
+        command_args.shift
+        [wagn_args, command_args]
+      end
     end
   end
 end

data/lib/wagn/commands/cucumber_command.rb

@@ -6,7 +6,9 @@ module Wagn
       def initialize args
         require "wagn"
         require "./config/environment"
-        @args = args
+        @wagn_args, @cucumber_args = split_args args
+        @opts = {}
+        Parser.new(@opts).parse!(@wagn_args)
       end
 
       def command
@@ -17,13 +19,18 @@ module Wagn
       private
 
       def env_args
-        env_args = "RAILS_ROOT=."
-        env_args << " COVERAGE=false" if @args.present?
+        env_args = @opts[:env].join " "
+        # turn coverage off if not all cukes run
+        env_args << " COVERAGE=false" if @cucumber_args.present?
         env_args
       end
 
       def feature_args
-        @args.empty? ? feature_paths.join(" ") : @args.shelljoin
+        if @cucumber_args.empty?
+          feature_paths.join(" ")
+        else
+          @cucumber_args.shelljoin
+        end
       end
 
       def require_args
@@ -39,3 +46,5 @@ module Wagn
     end
   end
 end
+
+require File.expand_path("../cucumber_command/parser", __FILE__)

data/lib/wagn/commands/cucumber_command/parser.rb

@@ -0,0 +1,33 @@
+# -*- encoding : utf-8 -*-
+require "optparse"
+
+module Wagn
+  module Commands
+    class CucumberCommand
+      class Parser < OptionParser
+        def initialize opts
+          super() do |parser|
+            parser.banner = "Usage: wagn cucumber [WAGN ARGS] -- [CUCUMBER ARGS]\n\n"
+            parser.separator <<-EOT.strip_heredoc
+
+               WAGN ARGS
+            EOT
+            opts[:env] = ["RAILS_ROOT=."]
+            parser.on("-d", "--debug", "Drop into debugger on failure") do |a|
+              opts[:env] << "DEBUG=1" if a
+            end
+            parser.on("-f", "--fast", "Stop on first failure") do |a|
+              opts[:env] << "FAST=1" if a
+            end
+            parser.on("-l", "--launchy", "Open page on failure") do |a|
+              opts[:env] << "LAUNCHY=1" if a
+            end
+            parser.on("-s", "--step", "Pause after each step") do |a|
+              opts[:env] << "STEP=1" if a
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/wagn/commands/rspec_command.rb

@@ -7,7 +7,7 @@ module Wagn
         require "rspec/core"
         require "wagn/application"
 
-        @wagn_args, @rspec_args = split_wagn_and_rspec_args args
+        @wagn_args, @rspec_args = split_args args
         @opts = {}
         Parser.new(@opts).parse!(@wagn_args)
       end
@@ -31,20 +31,8 @@ module Wagn
         end
         @opts[:simplecov]
       end
-
-      def split_wagn_and_rspec_args args
-        before_split = true
-        wagn, rspec =
-          args.partition do |a|
-            before_split = (a == "--" ? false : before_split)
-          end
-        rspec.shift
-        [wagn, rspec]
-      end
-
-
     end
   end
 end
 
-require File.expand_path("../rspec_command/parser", __FILE__)
+require File.expand_path("../rspec_command/parser", __FILE__)

data/lib/wagn/commands/rspec_command/parser.rb

@@ -81,4 +81,4 @@ module Wagn
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.20.1
+  version: 1.20.2
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-03-02 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.1
+        version: 1.20.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.20.1
+        version: 1.20.2
 description: a wiki approach to stuctured data, dynamic interaction,  and web design
 email:
 - info@wagn.org
@@ -114,6 +114,7 @@ files:
 - lib/wagn/commands/application.rb
 - lib/wagn/commands/command.rb
 - lib/wagn/commands/cucumber_command.rb
+- lib/wagn/commands/cucumber_command/parser.rb
 - lib/wagn/commands/rake_command.rb
 - lib/wagn/commands/rake_command/parser.rb
 - lib/wagn/commands/rspec_command.rb